summaryrefslogtreecommitdiffstats
path: root/lib/l10n/gl.php
diff options
context:
space:
mode:
authorThomas Mueller <thomas.mueller@tmit.eu>2013-06-14 10:06:13 +0200
committerThomas Mueller <thomas.mueller@tmit.eu>2013-06-14 10:06:13 +0200
commitc8564c07955ead3e85daa67e1871a2c41df3a6d5 (patch)
tree134c228f43e641d34fbf342df2745ece43580fee /lib/l10n/gl.php
parent0a29d2029a719d42f347edb95bd6486c2ab842a8 (diff)
parent6c534c8165d3c3fba64e3cf5c05993a84733eef7 (diff)
downloadnextcloud-server-c8564c07955ead3e85daa67e1871a2c41df3a6d5.tar.gz
nextcloud-server-c8564c07955ead3e85daa67e1871a2c41df3a6d5.zip
Merge branch 'master' into move-maint-start
Conflicts: lib/util.php
Diffstat (limited to 'lib/l10n/gl.php')
-rw-r--r--lib/l10n/gl.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/l10n/gl.php b/lib/l10n/gl.php
index 783826508c9..1b4db4b30af 100644
--- a/lib/l10n/gl.php
+++ b/lib/l10n/gl.php
@@ -24,7 +24,7 @@
"%s set the database host." => "%s estabeleza o servidor da base de datos",
"PostgreSQL username and/or password not valid" => "Nome de usuario e/ou contrasinal de PostgreSQL incorrecto",
"You need to enter either an existing account or the administrator." => "Deberá introducir unha conta existente ou o administrador.",
-"Oracle username and/or password not valid" => "Nome de usuario e/ou contrasinal de Oracle incorrecto",
+"Oracle connection could not be established" => "Non foi posíbel estabelecer a conexión con Oracle",
"MySQL username and/or password not valid" => "Nome de usuario e/ou contrasinal de MySQL incorrecto",
"DB Error: \"%s\"" => "Produciuse un erro na base de datos: «%s»",
"Offending command was: \"%s\"" => "A orde ofensiva foi: «%s»",
@@ -32,6 +32,7 @@
"Drop this user from MySQL" => "Omitir este usuario de MySQL",
"MySQL user '%s'@'%%' already exists" => "O usuario MySQL «%s»@«%%» xa existe.",
"Drop this user from MySQL." => "Omitir este usuario de MySQL.",
+"Oracle username and/or password not valid" => "Nome de usuario e/ou contrasinal de Oracle incorrecto",
"Offending command was: \"%s\", name: %s, password: %s" => "A orde ofensiva foi: «%s», nome: %s, contrasinal: %s",
"MS SQL username and/or password not valid: %s" => "Nome de usuario e/ou contrasinal de MS SQL incorrecto: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "O seu servidor web non está aínda configurado adecuadamente para permitir a sincronización de ficheiros xa que semella que a interface WebDAV non está a funcionar.",