diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2012-08-09 11:38:22 -0400 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2012-08-09 11:38:22 -0400 |
| commit | 78cd1153f012f871935130325167759898f030ab (patch) | |
| tree | 685a5fe56663e6b6087aa4f28c8f09daf1e80546 /core | |
| parent | b830b3e24b281204344e9162352c7034f0a67187 (diff) | |
| parent | f9cec1426fe639a5683e36b5fbdeb9149feacb19 (diff) | |
| download | nextcloud-server-78cd1153f012f871935130325167759898f030ab.tar.gz nextcloud-server-78cd1153f012f871935130325167759898f030ab.zip | |
Merge branch 'master' into share_api
Conflicts:
apps/contacts/lib/vcard.php
apps/files_sharing/sharedstorage.php
Diffstat (limited to 'core')
| -rw-r--r-- | core/l10n/de.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/l10n/de.php b/core/l10n/de.php index 121d17f6a8b..b0959a5412b 100644 --- a/core/l10n/de.php +++ b/core/l10n/de.php @@ -39,8 +39,8 @@ "Admin" => "Admin", "Help" => "Hilfe", "Access forbidden" => "Zugang verboten", -"Cloud not found" => "Cloud nicht verfügbar", -"Edit categories" => "Kategorien ändern", +"Cloud not found" => "Cloud nicht gefunden", +"Edit categories" => "Kategorien editieren", "Add" => "Hinzufügen", "Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen", "Password" => "Passwort", @@ -53,7 +53,7 @@ "Database name" => "Datenbank-Name", "Database host" => "Datenbank-Host", "Finish setup" => "Installation abschließen", -"web services under your control" => "web services under your control", +"web services under your control" => "Web Services unter ihrer Kontrolle", "Log out" => "Abmelden", "Lost your password?" => "Passwort vergessen?", "remember" => "merken", |