diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-09-07 15:42:37 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-09-07 15:51:44 +0200 |
| commit | 5eba5798274823fe3147a8d671ca5e15b3eb7843 (patch) | |
| tree | eb9cfb3fc687b8be26dde07a08fd23ca3455991f /core/l10n/gl.php | |
| parent | b483f2aab856e3324026588a9702043072fd7ad2 (diff) | |
| parent | 3829460ab8cbb6de65c53583a20fd04cbe7927dd (diff) | |
| download | nextcloud-server-5eba5798274823fe3147a8d671ca5e15b3eb7843.tar.gz nextcloud-server-5eba5798274823fe3147a8d671ca5e15b3eb7843.zip | |
Merge branch 'master' into routing
Conflicts:
apps/files/js/fileactions.js
lib/base.php
lib/helper.php
lib/ocs.php
Diffstat (limited to 'core/l10n/gl.php')
| -rw-r--r-- | core/l10n/gl.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/l10n/gl.php b/core/l10n/gl.php index eeff78826f8..af849712199 100644 --- a/core/l10n/gl.php +++ b/core/l10n/gl.php @@ -2,7 +2,6 @@ "Application name not provided." => "Non se indicou o nome do aplicativo.", "No category to add?" => "Sen categorÃa que engadir?", "This category already exists: " => "Esta categorÃa xa existe: ", -"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=", "Settings" => "Preferencias", "January" => "Xaneiro", "February" => "Febreiro", |