diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-10-02 10:11:18 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-10-02 10:11:18 +0200 |
| commit | 8b08b1b455b474de3fa376dfafa3de63727364ea (patch) | |
| tree | 536b2d4ba4f979d69f4f6e73755e06635345f78a /core/l10n/gl.php | |
| parent | 084f76fd14125023d5b7277c558eb86a20ea07d3 (diff) | |
| parent | 535ed8369f701a184340a428e82cc8d7cc7588bb (diff) | |
| download | nextcloud-server-8b08b1b455b474de3fa376dfafa3de63727364ea.tar.gz nextcloud-server-8b08b1b455b474de3fa376dfafa3de63727364ea.zip | |
Merge branch 'master' into sharing_mail_notification_master
Conflicts:
lib/private/util.php
Diffstat (limited to 'core/l10n/gl.php')
| -rw-r--r-- | core/l10n/gl.php | 9 |
1 files changed, 8 insertions, 1 deletions
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.", |