diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-25 09:52:12 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-25 09:52:12 +0200 |
| commit | db39fede97dc4d6b9a5caf739cb2c03b4dbdd21d (patch) | |
| tree | 0d8c9f25deb067ce23e901c72f2af842e9002341 /lib/l10n/ca.php | |
| parent | 843f15f3489856b518a30de4c803740844232209 (diff) | |
| parent | 2d12e52769a30ba37d5760b1194f613bcc71035b (diff) | |
| download | nextcloud-server-db39fede97dc4d6b9a5caf739cb2c03b4dbdd21d.tar.gz nextcloud-server-db39fede97dc4d6b9a5caf739cb2c03b4dbdd21d.zip | |
Merge branch 'master' into appframework-master
Conflicts:
apps/files/lib/helper.php
apps/files_trashbin/lib/helper.php
Diffstat (limited to 'lib/l10n/ca.php')
| -rw-r--r-- | lib/l10n/ca.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/l10n/ca.php b/lib/l10n/ca.php index 166455e652c..a8769224705 100644 --- a/lib/l10n/ca.php +++ b/lib/l10n/ca.php @@ -8,6 +8,9 @@ $TRANSLATIONS = array( "Users" => "Usuaris", "Admin" => "Administració", "Failed to upgrade \"%s\"." => "Ha fallat l'actualització \"%s\".", +"Custom profile pictures don't work with encryption yet" => "Les imatges de perfil personals encara no funcionen amb encriptació", +"Unknown filetype" => "Tipus de fitxer desconegut", +"Invalid image" => "Imatge no vàlida", "web services under your control" => "controleu els vostres serveis web", "cannot open \"%s\"" => "no es pot obrir \"%s\"", "ZIP download is turned off." => "La baixada en ZIP està desactivada.", |