summaryrefslogtreecommitdiffstats
path: root/settings/l10n/de_CH.php
diff options
context:
space:
mode:
authorkondou <kondou@ts.unde.re>2013-08-21 19:20:25 +0200
committerkondou <kondou@ts.unde.re>2013-08-21 19:20:25 +0200
commit0ce35af02acb2fa9fe0ef401dc75345b5114e3d6 (patch)
tree5ff19a7cc1bce5901cfeec7e11179ed2682b9e78 /settings/l10n/de_CH.php
parent7c296a6cf915da6630422ceb8e253ebf9f004964 (diff)
parenta89199cc7bd19f6ba3e76fcd510219b2bd930ae6 (diff)
downloadnextcloud-server-0ce35af02acb2fa9fe0ef401dc75345b5114e3d6.tar.gz
nextcloud-server-0ce35af02acb2fa9fe0ef401dc75345b5114e3d6.zip
Merge branch 'master' into improve_app-management
Conflicts: settings/js/apps.js
Diffstat (limited to 'settings/l10n/de_CH.php')
-rw-r--r--settings/l10n/de_CH.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/settings/l10n/de_CH.php b/settings/l10n/de_CH.php
index d874eafd3bf..b4c6f98edc3 100644
--- a/settings/l10n/de_CH.php
+++ b/settings/l10n/de_CH.php
@@ -102,6 +102,7 @@ $TRANSLATIONS = array(
"Help translate" => "Helfen Sie bei der Übersetzung",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Verwenden Sie diese Adresse, um <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">auf ihre Dateien per WebDAV zuzugreifen</a>.",
+"Encryption" => "Verschlüsselung",
"Login Name" => "Loginname",
"Create" => "Erstellen",
"Admin Recovery Password" => "Admin-Passwort-Wiederherstellung",