[tx-robot] updated from transifex

4 files changed, 36 insertions, 4 deletions

diff --git a/core/l10n/en_GB.php b/core/l10n/en_GB.php
index feeacd481a8..bb26f1469dd 100644
--- a/core/l10n/en_GB.php
+++ b/core/l10n/en_GB.php
@@ -58,8 +58,15 @@ $TRANSLATIONS = array(
 "No" => "No",
 "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_" => array("{count} file conflict","{count} file conflicts"),
+"One file conflict" => "One file conflict",
+"Which files do you want to keep?" => "Which files do you wish to keep?",
+"If you select both versions, the copied file will have a number added to its name." => "If you select both versions, the copied file will have a number added to its name.",
 "Cancel" => "Cancel",
+"Continue" => "Continue",
+"(all selected)" => "(all selected)",
+"({count} selected)" => "({count} selected)",
+"Error loading file exists template" => "Error loading file exists template",
 "The object type is not specified." => "The object type is not specified.",
 "Error" => "Error",
 "The app name is not specified." => "The app name is not specified.",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index d3229ddf994..29489e86b7f 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -56,8 +56,12 @@ $TRANSLATIONS = array(
 "No" => "Non",
 "Ok" => "Ok",
 "Error loading message template: {error}" => "Erreur de chargement du modèle de message : {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"_{count} file conflict_::_{count} file conflicts_" => array("{count} fichier en conflit","{count} fichiers en conflit"),
+"One file conflict" => "Un conflit de fichier",
+"Which files do you want to keep?" => "Quels fichiers désirez-vous garder ?",
+"If you select both versions, the copied file will have a number added to its name." => "Si vous sélectionnez les deux versions, un nombre sera ajouté au nom du fichier copié.",
 "Cancel" => "Annuler",
+"({count} selected)" => "({count} sélectionnés)",
 "The object type is not specified." => "Le type d'objet n'est pas spécifié.",
 "Error" => "Erreur",
 "The app name is not specified." => "Le nom de l'application n'est pas spécifié.",
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index 9ba5ab645aa..e3be94537e5 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -58,8 +58,15 @@ $TRANSLATIONS = array(
 "No" => "Non",
 "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} file conflict_::_{count} file conflicts_" => array("{count} conflito de ficheiro","{count} conflitos de ficheiros"),
+"One file conflict" => "Un conflito de ficheiro",
+"Which files do you want to keep?" => "Que ficheiros quere conservar?",
+"If you select both versions, the copied file will have a number added to its name." => "Se selecciona ambas versións, o ficheiro copiado terá un número engadido ao nome.",
 "Cancel" => "Cancelar",
+"Continue" => "Continuar",
+"(all selected)" => "(todo o seleccionado)",
+"({count} selected)" => "({count} seleccionados)",
+"Error loading file exists template" => "Produciuse un erro ao cargar o modelo de ficheiro existente",
 "The object type is not specified." => "Non se especificou o tipo de obxecto.",
 "Error" => "Erro",
 "The app name is not specified." => "Non se especificou o nome do aplicativo.",
diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php
index 8ec3892a8ac..d596605dbcd 100644
--- a/core/l10n/nn_NO.php
+++ b/core/l10n/nn_NO.php
@@ -16,6 +16,11 @@ $TRANSLATIONS = array(
 "Error adding %s to favorites." => "Klarte ikkje leggja til %s i favorittar.",
 "No categories selected for deletion." => "Ingen kategoriar valt for sletting.",
 "Error removing %s from favorites." => "Klarte ikkje fjerna %s frå favorittar.",
+"No image or file provided" => "Inga bilete eller fil gitt",
+"Unknown filetype" => "Ukjend filtype",
+"Invalid image" => "Ugyldig bilete",
+"No temporary profile picture available, try again" => "Inga midlertidig profilbilete tilgjengeleg, prøv igjen",
+"No crop data provided" => "Ingen beskjeringsdata gitt",
 "Sunday" => "Søndag",
 "Monday" => "Måndag",
 "Tuesday" => "Tysdag",
@@ -48,11 +53,20 @@ $TRANSLATIONS = array(
 "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",
 "Ok" => "Greitt",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Error loading message template: {error}" => "Klarte ikkje å lasta meldingsmal: {error}",
+"_{count} file conflict_::_{count} file conflicts_" => array("{count} filkonflikt","{count} filkonfliktar"),
+"One file conflict" => "Éin filkonflikt",
+"Which files do you want to keep?" => "Kva filer vil du spara?",
+"If you select both versions, the copied file will have a number added to its name." => "Viss du vel begge utgåvene, vil den kopierte fila få eit tal lagt til namnet.",
 "Cancel" => "Avbryt",
+"Continue" => "Gå vidare",
+"(all selected)" => "(alle valte)",
+"({count} selected)" => "({count} valte)",
+"Error loading file exists template" => "Klarte ikkje å lasta fil-finst-mal",
 "The object type is not specified." => "Objekttypen er ikkje spesifisert.",
 "Error" => "Feil",
 "The app name is not specified." => "Programnamnet er ikkje spesifisert.",