Merge remote-tracking branch 'upstream/master' into master-sync-upstream

5 files changed, 29 insertions, 2 deletions

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index e483882fcc5..0d00362ba71 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -2352,13 +2352,16 @@
 		 */
 		setFilter:function(filter) {
 			var total = 0;
+			if (this._filter === filter) {
+				return;
+			}
 			this._filter = filter;
 			this.fileSummary.setFilter(filter, this.files);
 			total = this.fileSummary.getTotal();
 			if (!this.$el.find('.mask').exists()) {
 				this.hideIrrelevantUIWhenNoFilesMatch();
 			}
-			var that = this;
+
 			var visibleCount = 0;
 			filter = filter.toLowerCase();
 
@@ -2378,7 +2381,7 @@
 				if (visibleCount < total) {
 					$trs = this._nextPage(false);
 				}
-			} while (visibleCount < total);
+			} while (visibleCount < total && $trs.length > 0);
 
 			this.$container.trigger('scroll');
 		},
diff --git a/apps/files/l10n/fr.js b/apps/files/l10n/fr.js
index b2d6662a9ce..b09bea28607 100644
--- a/apps/files/l10n/fr.js
+++ b/apps/files/l10n/fr.js
@@ -33,7 +33,15 @@ OC.L10N.register(
     "Could not get result from server." : "Ne peut recevoir les résultats du serveur.",
     "Uploading..." : "Téléversement en cours…",
     "..." : "...",
+    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} heure{plural_s} restante{plural_s}",
+    "{hours}:{minutes}h" : "{hours}:{minutes}h",
+    "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} minute{plural_s} restante{plural_s}",
+    "{minutes}:{seconds}m" : "{minutes}:{seconds}m",
+    "{seconds} second{plural_s} left" : "{seconds} seconde{plural_s} restante{plural_s}",
+    "{seconds}s" : "{seconds}s",
+    "Any moment now..." : "D'un instant à l'autre...",
     "Soon..." : "Bientôt...",
+    "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} sur {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier.",
     "Actions" : "Actions",
     "Download" : "Télécharger",
diff --git a/apps/files/l10n/fr.json b/apps/files/l10n/fr.json
index 780ef364b9f..882c40094df 100644
--- a/apps/files/l10n/fr.json
+++ b/apps/files/l10n/fr.json
@@ -31,7 +31,15 @@
     "Could not get result from server." : "Ne peut recevoir les résultats du serveur.",
     "Uploading..." : "Téléversement en cours…",
     "..." : "...",
+    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} heure{plural_s} restante{plural_s}",
+    "{hours}:{minutes}h" : "{hours}:{minutes}h",
+    "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} minute{plural_s} restante{plural_s}",
+    "{minutes}:{seconds}m" : "{minutes}:{seconds}m",
+    "{seconds} second{plural_s} left" : "{seconds} seconde{plural_s} restante{plural_s}",
+    "{seconds}s" : "{seconds}s",
+    "Any moment now..." : "D'un instant à l'autre...",
     "Soon..." : "Bientôt...",
+    "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} sur {totalSize} ({bitrate})",
     "File upload is in progress. Leaving the page now will cancel the upload." : "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier.",
     "Actions" : "Actions",
     "Download" : "Télécharger",
diff --git a/apps/files/l10n/lb.js b/apps/files/l10n/lb.js
index d7888f9f197..9fa3a0fdfaa 100644
--- a/apps/files/l10n/lb.js
+++ b/apps/files/l10n/lb.js
@@ -29,14 +29,18 @@ OC.L10N.register(
     "Size" : "Gréisst",
     "Modified" : "Geännert",
     "New" : "Nei",
+    "\"{name}\" is an invalid file name." : "\"{Numm}\" ass een ongültegen Numm fir e Fichier.",
+    "File name cannot be empty." : "Den Numm vum Fichier kann net eidel sinn.",
     "Folder" : "Dossier",
     "New folder" : "Neien Dossier",
     "Upload" : "Eroplueden",
+    "Upload (max. %s)" : "Eroplueden (max. %s)",
     "File handling" : "Fichier handling",
     "Maximum upload size" : "Maximum Upload Gréisst ",
     "max. possible: " : "max. méiglech:",
     "Save" : "Späicheren",
     "Settings" : "Astellungen",
+    "No files in here" : "Hei sinn keng Fichieren",
     "No entries found in this folder" : "Keng Elementer an dësem Dossier fonnt",
     "Select all" : "All auswielen",
     "Upload too large" : "Upload ze grouss",
diff --git a/apps/files/l10n/lb.json b/apps/files/l10n/lb.json
index a736e06570b..67da26b1ece 100644
--- a/apps/files/l10n/lb.json
+++ b/apps/files/l10n/lb.json
@@ -27,14 +27,18 @@
     "Size" : "Gréisst",
     "Modified" : "Geännert",
     "New" : "Nei",
+    "\"{name}\" is an invalid file name." : "\"{Numm}\" ass een ongültegen Numm fir e Fichier.",
+    "File name cannot be empty." : "Den Numm vum Fichier kann net eidel sinn.",
     "Folder" : "Dossier",
     "New folder" : "Neien Dossier",
     "Upload" : "Eroplueden",
+    "Upload (max. %s)" : "Eroplueden (max. %s)",
     "File handling" : "Fichier handling",
     "Maximum upload size" : "Maximum Upload Gréisst ",
     "max. possible: " : "max. méiglech:",
     "Save" : "Späicheren",
     "Settings" : "Astellungen",
+    "No files in here" : "Hei sinn keng Fichieren",
     "No entries found in this folder" : "Keng Elementer an dësem Dossier fonnt",
     "Select all" : "All auswielen",
     "Upload too large" : "Upload ze grouss",