summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJenkins for ownCloud <owncloud-bot@tmit.eu>2014-05-15 01:55:53 -0400
committerJenkins for ownCloud <owncloud-bot@tmit.eu>2014-05-15 01:55:53 -0400
commitd9d684197a05948876eacdfa71657e0578c93909 (patch)
treec93bba33bd30e7486b87ee217eef0178e4628d0d /core
parent48ee72732efb98d74000c3aa37afbd2cb9180c6f (diff)
downloadnextcloud-server-d9d684197a05948876eacdfa71657e0578c93909.tar.gz
nextcloud-server-d9d684197a05948876eacdfa71657e0578c93909.zip
[tx-robot] updated from transifex
Diffstat (limited to 'core')
-rw-r--r--core/l10n/af_ZA.php2
-rw-r--r--core/l10n/ar.php2
-rw-r--r--core/l10n/be.php2
-rw-r--r--core/l10n/bg_BG.php2
-rw-r--r--core/l10n/bn_BD.php2
-rw-r--r--core/l10n/ca.php4
-rw-r--r--core/l10n/cs_CZ.php4
-rw-r--r--core/l10n/cy_GB.php2
-rw-r--r--core/l10n/da.php4
-rw-r--r--core/l10n/de.php4
-rw-r--r--core/l10n/de_CH.php2
-rw-r--r--core/l10n/de_DE.php4
-rw-r--r--core/l10n/el.php5
-rw-r--r--core/l10n/en_GB.php4
-rw-r--r--core/l10n/eo.php2
-rw-r--r--core/l10n/es.php4
-rw-r--r--core/l10n/es_AR.php4
-rw-r--r--core/l10n/es_CL.php2
-rw-r--r--core/l10n/es_MX.php4
-rw-r--r--core/l10n/et_EE.php4
-rw-r--r--core/l10n/eu.php4
-rw-r--r--core/l10n/fa.php2
-rw-r--r--core/l10n/fi_FI.php4
-rw-r--r--core/l10n/fr.php4
-rw-r--r--core/l10n/gl.php4
-rw-r--r--core/l10n/he.php2
-rw-r--r--core/l10n/hr.php2
-rw-r--r--core/l10n/hu_HU.php4
-rw-r--r--core/l10n/ia.php2
-rw-r--r--core/l10n/id.php4
-rw-r--r--core/l10n/is.php2
-rw-r--r--core/l10n/it.php4
-rw-r--r--core/l10n/ja.php4
-rw-r--r--core/l10n/ka_GE.php2
-rw-r--r--core/l10n/km.php2
-rw-r--r--core/l10n/ko.php4
-rw-r--r--core/l10n/lb.php2
-rw-r--r--core/l10n/lt_LT.php4
-rw-r--r--core/l10n/lv.php2
-rw-r--r--core/l10n/mk.php2
-rw-r--r--core/l10n/my_MM.php2
-rw-r--r--core/l10n/nb_NO.php4
-rw-r--r--core/l10n/nl.php4
-rw-r--r--core/l10n/nn_NO.php4
-rw-r--r--core/l10n/oc.php2
-rw-r--r--core/l10n/pa.php2
-rw-r--r--core/l10n/pl.php4
-rw-r--r--core/l10n/pt_BR.php4
-rw-r--r--core/l10n/pt_PT.php4
-rw-r--r--core/l10n/ro.php2
-rw-r--r--core/l10n/ru.php4
-rw-r--r--core/l10n/si_LK.php2
-rw-r--r--core/l10n/sk_SK.php4
-rw-r--r--core/l10n/sl.php4
-rw-r--r--core/l10n/sq.php2
-rw-r--r--core/l10n/sr.php2
-rw-r--r--core/l10n/sr@latin.php2
-rw-r--r--core/l10n/sv.php4
-rw-r--r--core/l10n/ta_LK.php2
-rw-r--r--core/l10n/th_TH.php2
-rw-r--r--core/l10n/tr.php6
-rw-r--r--core/l10n/uk.php4
-rw-r--r--core/l10n/ur_PK.php2
-rw-r--r--core/l10n/vi.php4
-rw-r--r--core/l10n/zh_CN.php4
-rw-r--r--core/l10n/zh_TW.php4
66 files changed, 104 insertions, 103 deletions
diff --git a/core/l10n/af_ZA.php b/core/l10n/af_ZA.php
index 79efa67242c..a8016289e27 100644
--- a/core/l10n/af_ZA.php
+++ b/core/l10n/af_ZA.php
@@ -37,9 +37,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n maande gelede","%n maande gelede"),
"last year" => "verlede jaar",
"years ago" => "jare gelede",
-"Choose" => "Kies",
"Yes" => "Ja",
"No" => "Nee",
+"Choose" => "Kies",
"Ok" => "OK",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"New Files" => "Nuwe leêrs",
diff --git a/core/l10n/ar.php b/core/l10n/ar.php
index 16092348ec6..f28e4e48f8f 100644
--- a/core/l10n/ar.php
+++ b/core/l10n/ar.php
@@ -34,9 +34,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("","","","","",""),
"last year" => "السنةالماضية",
"years ago" => "سنة مضت",
-"Choose" => "اختيار",
"Yes" => "نعم",
"No" => "لا",
+"Choose" => "اختيار",
"Ok" => "موافق",
"_{count} file conflict_::_{count} file conflicts_" => array("","","","","",""),
"Cancel" => "الغاء",
diff --git a/core/l10n/be.php b/core/l10n/be.php
index 383d2494d2c..d0c3b3ecba7 100644
--- a/core/l10n/be.php
+++ b/core/l10n/be.php
@@ -30,9 +30,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("","","",""),
"last year" => "У мінулым годзе",
"years ago" => "Гадоў таму",
-"Choose" => "Выбар",
"Yes" => "Так",
"No" => "Не",
+"Choose" => "Выбар",
"Ok" => "Добра",
"_{count} file conflict_::_{count} file conflicts_" => array("","","",""),
"Error" => "Памылка",
diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php
index 861d7370ed1..63b9d286954 100644
--- a/core/l10n/bg_BG.php
+++ b/core/l10n/bg_BG.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "последната година",
"years ago" => "последните години",
-"Choose" => "Избери",
"Yes" => "Да",
"No" => "Не",
+"Choose" => "Избери",
"Ok" => "Добре",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"Cancel" => "Отказ",
diff --git a/core/l10n/bn_BD.php b/core/l10n/bn_BD.php
index e9f46d686c1..9f0e121bcad 100644
--- a/core/l10n/bn_BD.php
+++ b/core/l10n/bn_BD.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "গত বছর",
"years ago" => "বছর পূর্বে",
-"Choose" => "বেছে নিন",
"Yes" => "হ্যাঁ",
"No" => "না",
+"Choose" => "বেছে নিন",
"Ok" => "তথাস্তু",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"Cancel" => "বাতির",
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index d4adb682f8a..f4060bd3df0 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("fa %n mes","fa %n mesos"),
"last year" => "l'any passat",
"years ago" => "anys enrere",
-"Choose" => "Escull",
-"Error loading file picker template: {error}" => "Error en carregar la plantilla de càrrega de fitxers: {error}",
"Yes" => "Sí",
"No" => "No",
+"Choose" => "Escull",
+"Error loading file picker template: {error}" => "Error en carregar la plantilla de càrrega de fitxers: {error}",
"Ok" => "D'acord",
"Error loading message template: {error}" => "Error en carregar la plantilla de missatge: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} conflicte de fitxer","{count} conflictes de fitxer"),
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index 2e373e63bae..6a3ba0d3097 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("před %n měsícem","před %n měsíci","před %n měsíci"),
"last year" => "minulý rok",
"years ago" => "před lety",
-"Choose" => "Vybrat",
-"Error loading file picker template: {error}" => "Chyba při nahrávání šablony výběru souborů: {error}",
"Yes" => "Ano",
"No" => "Ne",
+"Choose" => "Vybrat",
+"Error loading file picker template: {error}" => "Chyba při nahrávání šablony výběru souborů: {error}",
"Ok" => "Ok",
"Error loading message template: {error}" => "Chyba při nahrávání šablony zprávy: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} souborový konflikt","{count} souborové konflikty","{count} souborových konfliktů"),
diff --git a/core/l10n/cy_GB.php b/core/l10n/cy_GB.php
index b79c1d5df59..1e88cd71c8e 100644
--- a/core/l10n/cy_GB.php
+++ b/core/l10n/cy_GB.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("","","",""),
"last year" => "y llynedd",
"years ago" => "blwyddyn yn ôl",
-"Choose" => "Dewisiwch",
"Yes" => "Ie",
"No" => "Na",
+"Choose" => "Dewisiwch",
"Ok" => "Iawn",
"_{count} file conflict_::_{count} file conflicts_" => array("","","",""),
"Cancel" => "Diddymu",
diff --git a/core/l10n/da.php b/core/l10n/da.php
index f7906e168bc..d3b346832fc 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n måned siden","%n måneder siden"),
"last year" => "sidste år",
"years ago" => "år siden",
-"Choose" => "Vælg",
-"Error loading file picker template: {error}" => "Fejl ved indlæsning af filvælger skabelon: {error}",
"Yes" => "Ja",
"No" => "Nej",
+"Choose" => "Vælg",
+"Error loading file picker template: {error}" => "Fejl ved indlæsning af filvælger skabelon: {error}",
"Ok" => "OK",
"Error loading message template: {error}" => "Fejl ved indlæsning af besked skabelon: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} filkonflikt","{count} filkonflikter"),
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 7a0aecf4d5f..6580cb07ed6 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("Vor %n Monat","Vor %n Monaten"),
"last year" => "Letztes Jahr",
"years ago" => "Vor Jahren",
-"Choose" => "Auswählen",
-"Error loading file picker template: {error}" => "Fehler beim Laden der Dateiauswahlvorlage: {error}",
"Yes" => "Ja",
"No" => "Nein",
+"Choose" => "Auswählen",
+"Error loading file picker template: {error}" => "Fehler beim Laden der Dateiauswahlvorlage: {error}",
"Ok" => "OK",
"Error loading message template: {error}" => "Fehler beim Laden der Nachrichtenvorlage: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} Dateikonflikt","{count} Dateikonflikte"),
diff --git a/core/l10n/de_CH.php b/core/l10n/de_CH.php
index 1a2c56635cf..44152d9dfa1 100644
--- a/core/l10n/de_CH.php
+++ b/core/l10n/de_CH.php
@@ -34,9 +34,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("Vor %n Monat","Vor %n Monaten"),
"last year" => "Letztes Jahr",
"years ago" => "Vor Jahren",
-"Choose" => "Auswählen",
"Yes" => "Ja",
"No" => "Nein",
+"Choose" => "Auswählen",
"Ok" => "OK",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"New Files" => "Neue Dateien",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index b8bce778f87..d9d7f3c6ccc 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("Vor %n Monat","Vor %n Monaten"),
"last year" => "Letztes Jahr",
"years ago" => "Vor Jahren",
-"Choose" => "Auswählen",
-"Error loading file picker template: {error}" => "Fehler beim Laden der Dateiauswahlvorlage: {error}",
"Yes" => "Ja",
"No" => "Nein",
+"Choose" => "Auswählen",
+"Error loading file picker template: {error}" => "Fehler beim Laden der Dateiauswahlvorlage: {error}",
"Ok" => "OK",
"Error loading message template: {error}" => "Fehler beim Laden der Nachrichtenvorlage: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} Dateikonflikt","{count} Dateikonflikte"),
diff --git a/core/l10n/el.php b/core/l10n/el.php
index c9506fda05a..7486e980e06 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -41,15 +41,16 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n μήνας πριν","%n μήνες πριν"),
"last year" => "τελευταίο χρόνο",
"years ago" => "χρόνια πριν",
-"Choose" => "Επιλέξτε",
-"Error loading file picker template: {error}" => "Σφάλμα κατά την φόρτωση προτύπου επιλογέα αρχείων: {σφάλμα}",
"Yes" => "Ναι",
"No" => "Όχι",
+"Choose" => "Επιλέξτε",
+"Error loading file picker template: {error}" => "Σφάλμα κατά την φόρτωση προτύπου επιλογέα αρχείων: {σφάλμα}",
"Ok" => "Οκ",
"Error loading message template: {error}" => "Σφάλμα φόρτωσης προτύπου μηνυμάτων: {σφάλμα}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} αρχείο διαφέρει","{count} αρχεία διαφέρουν"),
"One file conflict" => "Ένα αρχείο διαφέρει",
"New Files" => "Νέα Αρχεία",
+"Already existing files" => "Ήδη υπάρχοντα αρχεία",
"Which files do you want to keep?" => "Ποια αρχεία θέλετε να κρατήσετε;",
"If you select both versions, the copied file will have a number added to its name." => "Εάν επιλέξετε και τις δυο εκδοχές, ένας αριθμός θα προστεθεί στο αντιγραφόμενο αρχείο.",
"Cancel" => "Άκυρο",
diff --git a/core/l10n/en_GB.php b/core/l10n/en_GB.php
index 016bf23e8e1..2875ba732de 100644
--- a/core/l10n/en_GB.php
+++ b/core/l10n/en_GB.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n month ago","%n months ago"),
"last year" => "last year",
"years ago" => "years ago",
-"Choose" => "Choose",
-"Error loading file picker template: {error}" => "Error loading file picker template: {error}",
"Yes" => "Yes",
"No" => "No",
+"Choose" => "Choose",
+"Error loading file picker template: {error}" => "Error loading file picker template: {error}",
"Ok" => "OK",
"Error loading message template: {error}" => "Error loading message template: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} file conflict","{count} file conflicts"),
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index 19d330e5c26..9368a357d2c 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -34,9 +34,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("antaŭ %n monato","antaŭ %n monatoj"),
"last year" => "lastajare",
"years ago" => "jaroj antaŭe",
-"Choose" => "Elekti",
"Yes" => "Jes",
"No" => "Ne",
+"Choose" => "Elekti",
"Ok" => "Akcepti",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} dosierkonflikto","{count} dosierkonfliktoj"),
"One file conflict" => "Unu dosierkonflikto",
diff --git a/core/l10n/es.php b/core/l10n/es.php
index ca314a8b537..2e46abc366e 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("Hace %n mes","hace %n meses"),
"last year" => "el año pasado",
"years ago" => "hace años",
-"Choose" => "Seleccionar",
-"Error loading file picker template: {error}" => "Error cargando plantilla del seleccionador de archivos: {error}",
"Yes" => "Sí",
"No" => "No",
+"Choose" => "Seleccionar",
+"Error loading file picker template: {error}" => "Error cargando plantilla del seleccionador de archivos: {error}",
"Ok" => "Aceptar",
"Error loading message template: {error}" => "Error cargando plantilla del mensaje: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} conflicto de archivo","{count} conflictos de archivo"),
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
index 1bf43449fd7..cc15230ee45 100644
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@@ -40,10 +40,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("Hace %n mes","Hace %n meses"),
"last year" => "el año pasado",
"years ago" => "años atrás",
-"Choose" => "Elegir",
-"Error loading file picker template: {error}" => "Error cargando la plantilla del selector de archivo: {error}",
"Yes" => "Sí",
"No" => "No",
+"Choose" => "Elegir",
+"Error loading file picker template: {error}" => "Error cargando la plantilla del selector de archivo: {error}",
"Ok" => "Aceptar",
"Error loading message template: {error}" => "Error cargando la plantilla del mensaje: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("un archivo en conflicto","{count} archivos en conflicto"),
diff --git a/core/l10n/es_CL.php b/core/l10n/es_CL.php
index cab130cbd3c..f3e7788596d 100644
--- a/core/l10n/es_CL.php
+++ b/core/l10n/es_CL.php
@@ -30,9 +30,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "último año",
"years ago" => "años anteriores",
-"Choose" => "Choose",
"Yes" => "Si",
"No" => "No",
+"Choose" => "Choose",
"Ok" => "Ok",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"Cancel" => "Cancelar",
diff --git a/core/l10n/es_MX.php b/core/l10n/es_MX.php
index dca69ebaa33..fe5243e7a5e 100644
--- a/core/l10n/es_MX.php
+++ b/core/l10n/es_MX.php
@@ -40,10 +40,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("Hace %n mes","Hace %n meses"),
"last year" => "el año pasado",
"years ago" => "años antes",
-"Choose" => "Seleccionar",
-"Error loading file picker template: {error}" => "Error cargando plantilla del seleccionador de archivos: {error}",
"Yes" => "Sí",
"No" => "No",
+"Choose" => "Seleccionar",
+"Error loading file picker template: {error}" => "Error cargando plantilla del seleccionador de archivos: {error}",
"Ok" => "Aceptar",
"Error loading message template: {error}" => "Error cargando plantilla del mensaje: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} conflicto de archivo","{count} conflictos de archivo"),
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index 4807bc0414c..253761a619e 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n kuu tagasi","%n kuud tagasi"),
"last year" => "viimasel aastal",
"years ago" => "aastat tagasi",
-"Choose" => "Vali",
-"Error loading file picker template: {error}" => "Viga failivalija malli laadimisel: {error}",
"Yes" => "Jah",
"No" => "Ei",
+"Choose" => "Vali",
+"Error loading file picker template: {error}" => "Viga failivalija malli laadimisel: {error}",
"Ok" => "Ok",
"Error loading message template: {error}" => "Viga sõnumi malli laadimisel: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} failikonflikt","{count} failikonflikti"),
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index 13a28602ffd..aebd5d56ca1 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -40,10 +40,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("orain dela hilabete %n","orain dela %n hilabete"),
"last year" => "joan den urtean",
"years ago" => "urte",
-"Choose" => "Aukeratu",
-"Error loading file picker template: {error}" => "Errorea fitxategi hautatzaile txantiloiak kargatzerakoan: {error}",
"Yes" => "Bai",
"No" => "Ez",
+"Choose" => "Aukeratu",
+"Error loading file picker template: {error}" => "Errorea fitxategi hautatzaile txantiloiak kargatzerakoan: {error}",
"Ok" => "Ados",
"Error loading message template: {error}" => "Errorea mezu txantiloia kargatzean: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("fitxategi {count}ek konfliktua sortu du","{count} fitxategik konfliktua sortu dute"),
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
index ee634f466c8..5e08a5baf7e 100644
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array(""),
"last year" => "سال قبل",
"years ago" => "سال‌های قبل",
-"Choose" => "انتخاب کردن",
"Yes" => "بله",
"No" => "نه",
+"Choose" => "انتخاب کردن",
"Ok" => "قبول",
"_{count} file conflict_::_{count} file conflicts_" => array(""),
"New Files" => "فایل های جدید",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 9188469abc2..711253090ad 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n kuukausi sitten","%n kuukautta sitten"),
"last year" => "viime vuonna",
"years ago" => "vuotta sitten",
-"Choose" => "Valitse",
-"Error loading file picker template: {error}" => "Virhe ladatessa tiedostopohjia: {error}",
"Yes" => "Kyllä",
"No" => "Ei",
+"Choose" => "Valitse",
+"Error loading file picker template: {error}" => "Virhe ladatessa tiedostopohjia: {error}",
"Ok" => "Ok",
"Error loading message template: {error}" => "Virhe ladatessa viestipohjaa: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} tiedoston ristiriita","{count} tiedoston ristiriita"),
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 49be57abf37..cefba312d2b 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("Il y a %n mois","Il y a %n mois"),
"last year" => "l'année dernière",
"years ago" => "il y a plusieurs années",
-"Choose" => "Choisir",
-"Error loading file picker template: {error}" => "Erreur de chargement du modèle de sélectionneur de fichiers : {error}",
"Yes" => "Oui",
"No" => "Non",
+"Choose" => "Choisir",
+"Error loading file picker template: {error}" => "Erreur de chargement du modèle de sélectionneur de fichiers : {error}",
"Ok" => "Ok",
"Error loading message template: {error}" => "Erreur de chargement du modèle de message : {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} fichier en conflit","{count} fichiers en conflit"),
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index 9509446ec7c..c75f10a6a9a 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("hai %n mes","hai %n meses"),
"last year" => "último ano",
"years ago" => "anos atrás",
-"Choose" => "Escoller",
-"Error loading file picker template: {error}" => "Produciuse un erro ao cargar o modelo do selector: {error}",
"Yes" => "Si",
"No" => "Non",
+"Choose" => "Escoller",
+"Error loading file picker template: {error}" => "Produciuse un erro ao cargar o modelo do selector: {error}",
"Ok" => "Aceptar",
"Error loading message template: {error}" => "Produciuse un erro ao cargar o modelo da mensaxe: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} conflito de ficheiro","{count} conflitos de ficheiros"),
diff --git a/core/l10n/he.php b/core/l10n/he.php
index d629ac66213..79c70d0ded8 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("לפני %n חודש","לפני %n חודשים"),
"last year" => "שנה שעברה",
"years ago" => "שנים",
-"Choose" => "בחירה",
"Yes" => "כן",
"No" => "לא",
+"Choose" => "בחירה",
"Ok" => "בסדר",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"New Files" => "קבצים חדשים",
diff --git a/core/l10n/hr.php b/core/l10n/hr.php
index 60b82a22ad7..98f81f6c660 100644
--- a/core/l10n/hr.php
+++ b/core/l10n/hr.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("","",""),
"last year" => "prošlu godinu",
"years ago" => "godina",
-"Choose" => "Izaberi",
"Yes" => "Da",
"No" => "Ne",
+"Choose" => "Izaberi",
"Ok" => "U redu",
"_{count} file conflict_::_{count} file conflicts_" => array("","",""),
"Cancel" => "Odustani",
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index 56b8b4dbc4a..bdcb5c13bfc 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n hónappal ezelőtt","%n hónappal ezelőtt"),
"last year" => "tavaly",
"years ago" => "több éve",
-"Choose" => "Válasszon",
-"Error loading file picker template: {error}" => "Nem sikerült betölteni a fájlkiválasztó sablont: {error}",
"Yes" => "Igen",
"No" => "Nem",
+"Choose" => "Válasszon",
+"Error loading file picker template: {error}" => "Nem sikerült betölteni a fájlkiválasztó sablont: {error}",
"Ok" => "Ok",
"Error loading message template: {error}" => "Nem sikerült betölteni az üzenet sablont: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} fájl ütközik","{count} fájl ütközik"),
diff --git a/core/l10n/ia.php b/core/l10n/ia.php
index ef9c79a654f..42f40a160b2 100644
--- a/core/l10n/ia.php
+++ b/core/l10n/ia.php
@@ -38,9 +38,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "ultime anno",
"years ago" => "annos passate",
-"Choose" => "Seliger",
"Yes" => "Si",
"No" => "No",
+"Choose" => "Seliger",
"Ok" => "Ok",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} conflicto de file","{count} conflictos de file"),
"One file conflict" => "Un conflicto de file",
diff --git a/core/l10n/id.php b/core/l10n/id.php
index 7bb6883943d..6d2b92395b0 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -40,10 +40,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n bulan yang lalu"),
"last year" => "tahun kemarin",
"years ago" => "beberapa tahun lalu",
-"Choose" => "Pilih",
-"Error loading file picker template: {error}" => "Galat memuat templat berkas pemilih: {error}",
"Yes" => "Ya",
"No" => "Tidak",
+"Choose" => "Pilih",
+"Error loading file picker template: {error}" => "Galat memuat templat berkas pemilih: {error}",
"Ok" => "Oke",
"Error loading message template: {error}" => "Galat memuat templat pesan: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} berkas konflik"),
diff --git a/core/l10n/is.php b/core/l10n/is.php
index 254c4b38689..6ec4ac3ad8a 100644
--- a/core/l10n/is.php
+++ b/core/l10n/is.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "síðasta ári",
"years ago" => "einhverjum árum",
-"Choose" => "Veldu",
"Yes" => "Já",
"No" => "Nei",
+"Choose" => "Veldu",
"Ok" => "Í lagi",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"Cancel" => "Hætta við",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index dfcc0a480ac..7159099a35a 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n mese fa","%n mesi fa"),
"last year" => "anno scorso",
"years ago" => "anni fa",
-"Choose" => "Scegli",
-"Error loading file picker template: {error}" => "Errore durante il caricamento del modello del selettore file: {error}",
"Yes" => "Sì",
"No" => "No",
+"Choose" => "Scegli",
+"Error loading file picker template: {error}" => "Errore durante il caricamento del modello del selettore file: {error}",
"Ok" => "Ok",
"Error loading message template: {error}" => "Errore durante il caricamento del modello di messaggio: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} file in conflitto","{count} file in conflitto"),
diff --git a/core/l10n/ja.php b/core/l10n/ja.php
index cedf0009cb5..744bfb2b119 100644
--- a/core/l10n/ja.php
+++ b/core/l10n/ja.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%nヶ月前"),
"last year" => "1年前",
"years ago" => "数年前",
-"Choose" => "選択",
-"Error loading file picker template: {error}" => "ファイル選択テンプレートの読み込みエラー: {error}",
"Yes" => "はい",
"No" => "いいえ",
+"Choose" => "選択",
+"Error loading file picker template: {error}" => "ファイル選択テンプレートの読み込みエラー: {error}",
"Ok" => "OK",
"Error loading message template: {error}" => "メッセージテンプレートの読み込みエラー: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} ファイルが競合"),
diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php
index 3389bafa7a2..d000dd75435 100644
--- a/core/l10n/ka_GE.php
+++ b/core/l10n/ka_GE.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array(""),
"last year" => "ბოლო წელს",
"years ago" => "წლის წინ",
-"Choose" => "არჩევა",
"Yes" => "კი",
"No" => "არა",
+"Choose" => "არჩევა",
"Ok" => "დიახ",
"_{count} file conflict_::_{count} file conflicts_" => array(""),
"New Files" => "ახალი ფაილები",
diff --git a/core/l10n/km.php b/core/l10n/km.php
index 76b1492456c..7d13f5fd3cd 100644
--- a/core/l10n/km.php
+++ b/core/l10n/km.php
@@ -33,9 +33,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n ខែ​មុន"),
"last year" => "ឆ្នាំ​មុន",
"years ago" => "ឆ្នាំ​មុន",
-"Choose" => "ជ្រើស",
"Yes" => "ព្រម",
"No" => "ទេ",
+"Choose" => "ជ្រើស",
"Ok" => "ព្រម",
"_{count} file conflict_::_{count} file conflicts_" => array(""),
"New Files" => "ឯកសារ​ថ្មី",
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
index d8c32e070d3..3e2bff3ad67 100644
--- a/core/l10n/ko.php
+++ b/core/l10n/ko.php
@@ -40,10 +40,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n달 전 "),
"last year" => "작년",
"years ago" => "년 전",
-"Choose" => "선택",
-"Error loading file picker template: {error}" => "파일 선택 템플릿을 불러오는 중 오류 발생: {error}",
"Yes" => "예",
"No" => "아니요",
+"Choose" => "선택",
+"Error loading file picker template: {error}" => "파일 선택 템플릿을 불러오는 중 오류 발생: {error}",
"Ok" => "확인",
"Error loading message template: {error}" => "메시지 템플릿을 불러오는 중 오류 발생: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("파일 {count}개 충돌"),
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
index 30337c5fc8f..4c806988ede 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -37,9 +37,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "Lescht Joer",
"years ago" => "Joren hir",
-"Choose" => "Auswielen",
"Yes" => "Jo",
"No" => "Nee",
+"Choose" => "Auswielen",
"Ok" => "OK",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"Which files do you want to keep?" => "Weieng Fichieren wëlls de gär behalen?",
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index e3b612df3fa..019c4aac36f 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -40,10 +40,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("prieš %n mėnesį","prieš %n mėnesius","prieš %n mėnesių"),
"last year" => "praeitais metais",
"years ago" => "prieš metus",
-"Choose" => "Pasirinkite",
-"Error loading file picker template: {error}" => "Klaida įkeliant failo parinkimo ruošinį: {error}",
"Yes" => "Taip",
"No" => "Ne",
+"Choose" => "Pasirinkite",
+"Error loading file picker template: {error}" => "Klaida įkeliant failo parinkimo ruošinį: {error}",
"Ok" => "Gerai",
"Error loading message template: {error}" => "Klaida įkeliant žinutės ruošinį: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} failas konfliktuoja","{count} failai konfliktuoja","{count} failų konfliktų"),
diff --git a/core/l10n/lv.php b/core/l10n/lv.php
index 37cde915c5e..6e2c2c566a7 100644
--- a/core/l10n/lv.php
+++ b/core/l10n/lv.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("Šomēnes, %n mēneši","Pirms %n mēneša","Pirms %n mēnešiem"),
"last year" => "gājušajā gadā",
"years ago" => "gadus atpakaļ",
-"Choose" => "Izvēlieties",
"Yes" => "Jā",
"No" => "Nē",
+"Choose" => "Izvēlieties",
"Ok" => "Labi",
"_{count} file conflict_::_{count} file conflicts_" => array("","",""),
"New Files" => "Jaunās datnes",
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index 64c6671abf8..4ba3c7fc80a 100644
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@@ -37,9 +37,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "минатата година",
"years ago" => "пред години",
-"Choose" => "Избери",
"Yes" => "Да",
"No" => "Не",
+"Choose" => "Избери",
"Ok" => "Во ред",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"One file conflict" => "Конфликт со една датотека",
diff --git a/core/l10n/my_MM.php b/core/l10n/my_MM.php
index 4ccf19b186e..b9cabbc8dfd 100644
--- a/core/l10n/my_MM.php
+++ b/core/l10n/my_MM.php
@@ -22,9 +22,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array(""),
"last year" => "မနှစ်က",
"years ago" => "နှစ် အရင်က",
-"Choose" => "ရွေးချယ်",
"Yes" => "ဟုတ်",
"No" => "မဟုတ်ဘူး",
+"Choose" => "ရွေးချယ်",
"Ok" => "အိုကေ",
"_{count} file conflict_::_{count} file conflicts_" => array(""),
"Cancel" => "ပယ်ဖျက်မည်",
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index 2a9873f4815..e5734d437ce 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -40,10 +40,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n dag siden","%n dager siden"),
"last year" => "i fjor",
"years ago" => "år siden",
-"Choose" => "Velg",
-"Error loading file picker template: {error}" => "Feil ved lasting av filvelger-mal: {error}",
"Yes" => "Ja",
"No" => "Nei",
+"Choose" => "Velg",
+"Error loading file picker template: {error}" => "Feil ved lasting av filvelger-mal: {error}",
"Ok" => "Ok",
"Error loading message template: {error}" => "Feil ved lasting av meldingsmal: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} filkonflikt","{count} filkonflikter"),
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index 961866fc158..e9c07af5d36 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("","%n maanden geleden"),
"last year" => "vorig jaar",
"years ago" => "jaar geleden",
-"Choose" => "Kies",
-"Error loading file picker template: {error}" => "Fout bij laden bestandenselecteur sjabloon: {error}",
"Yes" => "Ja",
"No" => "Nee",
+"Choose" => "Kies",
+"Error loading file picker template: {error}" => "Fout bij laden bestandenselecteur sjabloon: {error}",
"Ok" => "Ok",
"Error loading message template: {error}" => "Fout bij laden berichtensjabloon: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} bestandsconflict","{count} bestandsconflicten"),
diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php
index 25d0f1da725..260920f3cdb 100644
--- a/core/l10n/nn_NO.php
+++ b/core/l10n/nn_NO.php
@@ -40,10 +40,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n månad sidan","%n månadar sidan"),
"last year" => "i fjor",
"years ago" => "år sidan",
-"Choose" => "Vel",
-"Error loading file picker template: {error}" => "Klarte ikkje å lasta filplukkarmal: {error}",
"Yes" => "Ja",
"No" => "Nei",
+"Choose" => "Vel",
+"Error loading file picker template: {error}" => "Klarte ikkje å lasta filplukkarmal: {error}",
"Ok" => "Greitt",
"Error loading message template: {error}" => "Klarte ikkje å lasta meldingsmal: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} filkonflikt","{count} filkonfliktar"),
diff --git a/core/l10n/oc.php b/core/l10n/oc.php
index b13275822bd..b025eeaf71d 100644
--- a/core/l10n/oc.php
+++ b/core/l10n/oc.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "an passat",
"years ago" => "ans a",
-"Choose" => "Causís",
"Yes" => "Òc",
"No" => "Non",
+"Choose" => "Causís",
"Ok" => "D'accòrdi",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"Cancel" => "Annula",
diff --git a/core/l10n/pa.php b/core/l10n/pa.php
index 021452d0b31..52818e60826 100644
--- a/core/l10n/pa.php
+++ b/core/l10n/pa.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "ਪਿਛਲੇ ਸਾਲ",
"years ago" => "ਸਾਲਾਂ ਪਹਿਲਾਂ",
-"Choose" => "ਚੁਣੋ",
"Yes" => "ਹਾਂ",
"No" => "ਨਹੀਂ",
+"Choose" => "ਚੁਣੋ",
"Ok" => "ਠੀਕ ਹੈ",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"Cancel" => "ਰੱਦ ਕਰੋ",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 0e9860b4bf9..f75cf0eaafa 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n miesiąc temu","%n miesięcy temu","%n miesięcy temu"),
"last year" => "w zeszłym roku",
"years ago" => "lat temu",
-"Choose" => "Wybierz",
-"Error loading file picker template: {error}" => "Błąd podczas ładowania pliku wybranego szablonu: {error}",
"Yes" => "Tak",
"No" => "Nie",
+"Choose" => "Wybierz",
+"Error loading file picker template: {error}" => "Błąd podczas ładowania pliku wybranego szablonu: {error}",
"Ok" => "OK",
"Error loading message template: {error}" => "Błąd podczas ładowania szablonu wiadomości: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} konfliktów plików","{count} konfliktów plików","{count} konfliktów plików"),
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index a7b671b4408..d16f2b83d61 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("ha %n mês","ha %n meses"),
"last year" => "último ano",
"years ago" => "anos atrás",
-"Choose" => "Escolha",
-"Error loading file picker template: {error}" => "Erro no seletor de carregamento modelo de arquivos: {error}",
"Yes" => "Sim",
"No" => "Não",
+"Choose" => "Escolha",
+"Error loading file picker template: {error}" => "Erro no seletor de carregamento modelo de arquivos: {error}",
"Ok" => "Ok",
"Error loading message template: {error}" => "Erro no carregamento de modelo de mensagem: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} conflito de arquivo","{count} conflitos de arquivos"),
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index 8c5d3fd5a6a..db5923ee5ff 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n mês atrás","%n meses atrás"),
"last year" => "ano passado",
"years ago" => "anos atrás",
-"Choose" => "Escolha",
-"Error loading file picker template: {error}" => "Erro ao carregar o modelo de selecionador de ficheiro: {error}",
"Yes" => "Sim",
"No" => "Não",
+"Choose" => "Escolha",
+"Error loading file picker template: {error}" => "Erro ao carregar o modelo de selecionador de ficheiro: {error}",
"Ok" => "Ok",
"Error loading message template: {error}" => "Erro ao carregar o template: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} conflicto de ficheiro","{count} conflitos de ficheiro"),
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index 648e8ba3eaf..8d4f2ad164f 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -34,9 +34,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("","",""),
"last year" => "ultimul an",
"years ago" => "ani în urmă",
-"Choose" => "Alege",
"Yes" => "Da",
"No" => "Nu",
+"Choose" => "Alege",
"Ok" => "Ok",
"_{count} file conflict_::_{count} file conflicts_" => array("","",""),
"One file conflict" => "Un conflict de fișier",
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index a09178a6cd1..16d8cf9a50e 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n месяц назад","%n месяца назад","%n месяцев назад"),
"last year" => "в прошлом году",
"years ago" => "несколько лет назад",
-"Choose" => "Выбрать",
-"Error loading file picker template: {error}" => "Ошибка при загрузке шаблона выбора файлов: {error}",
"Yes" => "Да",
"No" => "Нет",
+"Choose" => "Выбрать",
+"Error loading file picker template: {error}" => "Ошибка при загрузке шаблона выбора файлов: {error}",
"Ok" => "Ок",
"Error loading message template: {error}" => "Ошибка загрузки шаблона сообщений: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} конфликт в файлах","{count} конфликта в файлах","{count} конфликтов в файлах"),
diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php
index bb125cc6af7..e77a5067879 100644
--- a/core/l10n/si_LK.php
+++ b/core/l10n/si_LK.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "පෙර අවුරුද්දේ",
"years ago" => "අවුරුදු කීපයකට පෙර",
-"Choose" => "තෝරන්න",
"Yes" => "ඔව්",
"No" => "එපා",
+"Choose" => "තෝරන්න",
"Ok" => "හරි",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"Cancel" => "එපා",
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index 80d816a461d..c5676eab80c 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("pred %n mesiacom","pred %n mesiacmi","pred %n mesiacmi"),
"last year" => "minulý rok",
"years ago" => "pred rokmi",
-"Choose" => "Vybrať",
-"Error loading file picker template: {error}" => "Chyba pri nahrávaní šablóny výberu súborov: {error}",
"Yes" => "Áno",
"No" => "Nie",
+"Choose" => "Vybrať",
+"Error loading file picker template: {error}" => "Chyba pri nahrávaní šablóny výberu súborov: {error}",
"Ok" => "Ok",
"Error loading message template: {error}" => "Chyba pri nahrávaní šablóny správy: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} konflikt súboru","{count} konflikty súboru","{count} konfliktov súboru"),
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index c87a8d8d8f3..3a43fb99c15 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("pred %n mesecem","pred %n mesecema","pred %n meseci","pred %n meseci"),
"last year" => "lansko leto",
"years ago" => "let nazaj",
-"Choose" => "Izbor",
-"Error loading file picker template: {error}" => "Napaka nalaganja predloge izbirnika datotek: {error}",
"Yes" => "Da",
"No" => "Ne",
+"Choose" => "Izbor",
+"Error loading file picker template: {error}" => "Napaka nalaganja predloge izbirnika datotek: {error}",
"Ok" => "V redu",
"Error loading message template: {error}" => "Napaka nalaganja predloge sporočil: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} spor datotek","{count} spora datotek","{count} spori datotek","{count} sporov datotek"),
diff --git a/core/l10n/sq.php b/core/l10n/sq.php
index b3221dc75f3..7b66df7afcf 100644
--- a/core/l10n/sq.php
+++ b/core/l10n/sq.php
@@ -34,9 +34,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n muaj më parë","%n muaj më parë"),
"last year" => "vitin e shkuar",
"years ago" => "vite më parë",
-"Choose" => "Zgjidh",
"Yes" => "Po",
"No" => "Jo",
+"Choose" => "Zgjidh",
"Ok" => "Në rregull",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"Cancel" => "Anulo",
diff --git a/core/l10n/sr.php b/core/l10n/sr.php
index 388ebb0df92..5a9a1c01656 100644
--- a/core/l10n/sr.php
+++ b/core/l10n/sr.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("","",""),
"last year" => "прошле године",
"years ago" => "година раније",
-"Choose" => "Одабери",
"Yes" => "Да",
"No" => "Не",
+"Choose" => "Одабери",
"Ok" => "У реду",
"_{count} file conflict_::_{count} file conflicts_" => array("","",""),
"Cancel" => "Откажи",
diff --git a/core/l10n/sr@latin.php b/core/l10n/sr@latin.php
index e7783b3c023..c6b3de13ca6 100644
--- a/core/l10n/sr@latin.php
+++ b/core/l10n/sr@latin.php
@@ -30,9 +30,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("","",""),
"last year" => "prošle godine",
"years ago" => "pre nekoliko godina",
-"Choose" => "Izaberi",
"Yes" => "Da",
"No" => "Ne",
+"Choose" => "Izaberi",
"Ok" => "Ok",
"_{count} file conflict_::_{count} file conflicts_" => array("","",""),
"Cancel" => "Otkaži",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index f24398c662d..4714885675a 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n månad sedan","%n månader sedan"),
"last year" => "förra året",
"years ago" => "år sedan",
-"Choose" => "Välj",
-"Error loading file picker template: {error}" => "Fel uppstod för filväljarmall: {error}",
"Yes" => "Ja",
"No" => "Nej",
+"Choose" => "Välj",
+"Error loading file picker template: {error}" => "Fel uppstod för filväljarmall: {error}",
"Ok" => "Ok",
"Error loading message template: {error}" => "Fel uppstod under inläsningen av meddelandemallen: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} filkonflikt","{count} filkonflikter"),
diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php
index c0b4dce7cf4..72d195f833b 100644
--- a/core/l10n/ta_LK.php
+++ b/core/l10n/ta_LK.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "கடந்த வருடம்",
"years ago" => "வருடங்களுக்கு முன்",
-"Choose" => "தெரிவுசெய்க ",
"Yes" => "ஆம்",
"No" => "இல்லை",
+"Choose" => "தெரிவுசெய்க ",
"Ok" => "சரி",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"Cancel" => "இரத்து செய்க",
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index 61a67f78026..95416aaa26a 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array(""),
"last year" => "ปีที่แล้ว",
"years ago" => "ปี ที่ผ่านมา",
-"Choose" => "เลือก",
"Yes" => "ตกลง",
"No" => "ไม่ตกลง",
+"Choose" => "เลือก",
"Ok" => "ตกลง",
"_{count} file conflict_::_{count} file conflicts_" => array(""),
"New Files" => "ไฟล์ใหม่",
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index d5880d8a09d..fcb9470dcc2 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n ay önce","%n ay önce"),
"last year" => "geçen yıl",
"years ago" => "yıllar önce",
-"Choose" => "Seç",
-"Error loading file picker template: {error}" => "Dosya seçici şablonu yüklenirken hata: {error}",
"Yes" => "Evet",
"No" => "Hayır",
+"Choose" => "Seç",
+"Error loading file picker template: {error}" => "Dosya seçici şablonu yüklenirken hata: {error}",
"Ok" => "Tamam",
"Error loading message template: {error}" => "İleti şablonu yüklenirken hata: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} dosya çakışması","{count} dosya çakışması"),
@@ -162,7 +162,7 @@ $TRANSLATIONS = array(
"Finish setup" => "Kurulumu tamamla",
"Finishing …" => "Tamamlanıyor ...",
"This application requires JavaScript to be enabled for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "Uygulama, doğru çalışabilmesi için JavaScript'in etkinleştirilmesini gerektiriyor. Lütfen <a href=\"http://enable-javascript.com/\" target=\"_blank\">JavaScript'i etkinleştirin</a> ve bu arayüzü yeniden yükleyin.",
-"%s is available. Get more information on how to update." => "%s mevcut. Nasıl güncelleyeceğiniz hakkında daha fazla bilgi alın.",
+"%s is available. Get more information on how to update." => "%s kullanılabilir. Nasıl güncelleyeceğiniz hakkında daha fazla bilgi alın.",
"Log out" => "Çıkış yap",
"Automatic logon rejected!" => "Otomatik oturum açma reddedildi!",
"If you did not change your password recently, your account may be compromised!" => "Yakın zamanda parolanızı değiştirmediyseniz hesabınız tehlikede olabilir!",
diff --git a/core/l10n/uk.php b/core/l10n/uk.php
index 015183e6470..7d928c2c655 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n місяць тому","%n місяці тому","%n місяців тому"),
"last year" => "минулого року",
"years ago" => "роки тому",
-"Choose" => "Обрати",
-"Error loading file picker template: {error}" => "Помилка при завантаженні шаблону вибору: {error}",
"Yes" => "Так",
"No" => "Ні",
+"Choose" => "Обрати",
+"Error loading file picker template: {error}" => "Помилка при завантаженні шаблону вибору: {error}",
"Ok" => "Ok",
"Error loading message template: {error}" => "Помилка при завантаженні шаблону повідомлення: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} файловий конфлікт","{count} файлових конфліктів","{count} файлових конфліктів"),
diff --git a/core/l10n/ur_PK.php b/core/l10n/ur_PK.php
index 3012eb869c9..129ca916fd2 100644
--- a/core/l10n/ur_PK.php
+++ b/core/l10n/ur_PK.php
@@ -17,9 +17,9 @@ $TRANSLATIONS = array(
"_%n hour ago_::_%n hours ago_" => array("",""),
"_%n day ago_::_%n days ago_" => array("",""),
"_%n month ago_::_%n months ago_" => array("",""),
-"Choose" => "منتخب کریں",
"Yes" => "ہاں",
"No" => "نہیں",
+"Choose" => "منتخب کریں",
"Ok" => "اوکے",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"Cancel" => "منسوخ کریں",
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
index fe24cb385e5..3be7e9cc521 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -40,10 +40,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n tháng trước"),
"last year" => "năm trước",
"years ago" => "năm trước",
-"Choose" => "Chọn",
-"Error loading file picker template: {error}" => "Lỗi khi tải mẫu tập tin picker: {error}",
"Yes" => "Có",
"No" => "Không",
+"Choose" => "Chọn",
+"Error loading file picker template: {error}" => "Lỗi khi tải mẫu tập tin picker: {error}",
"Ok" => "Đồng ý",
"Error loading message template: {error}" => "Lỗi khi tải mẫu thông điệp: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} tập tin xung đột"),
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index 4d3c55b07f4..a172e301d2f 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n 月前"),
"last year" => "去年",
"years ago" => "年前",
-"Choose" => "选择(&C)...",
-"Error loading file picker template: {error}" => "加载文件分拣模板出错: {error}",
"Yes" => "是",
"No" => "否",
+"Choose" => "选择(&C)...",
+"Error loading file picker template: {error}" => "加载文件分拣模板出错: {error}",
"Ok" => "好",
"Error loading message template: {error}" => "加载消息模板出错: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} 个文件冲突"),
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index 465ae0c7008..4372707c334 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -40,10 +40,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n 個月前"),
"last year" => "去年",
"years ago" => "幾年前",
-"Choose" => "選擇",
-"Error loading file picker template: {error}" => "載入檔案選擇器樣板出錯: {error}",
"Yes" => "是",
"No" => "否",
+"Choose" => "選擇",
+"Error loading file picker template: {error}" => "載入檔案選擇器樣板出錯: {error}",
"Ok" => "好",
"Error loading message template: {error}" => "載入訊息樣板出錯: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} 個檔案衝突"),