aboutsummaryrefslogtreecommitdiffstats
path: root/core/l10n/de.php
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2013-07-24 09:35:33 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2013-07-24 09:35:33 +0200
commit1a73e607bdba6d654936bde632acaa4960dec729 (patch)
tree66e80e3fad82a91dd402582e08f0a97775a93502 /core/l10n/de.php
parent7242480049d1fcc32fba0d1acb7c8572d7b9350f (diff)
parent7bb6aab8eea731840d67d5e3aa302c04a593a4e0 (diff)
downloadnextcloud-server-1a73e607bdba6d654936bde632acaa4960dec729.tar.gz
nextcloud-server-1a73e607bdba6d654936bde632acaa4960dec729.zip
Merge branch 'master' into more-themable-strings
Conflicts: lib/template.php
Diffstat (limited to 'core/l10n/de.php')
-rw-r--r--core/l10n/de.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/l10n/de.php b/core/l10n/de.php
index c33045eb7b6..a8e1f811534 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -62,6 +62,7 @@
"Share with link" => "Über einen Link freigegeben",
"Password protect" => "Passwortschutz",
"Password" => "Passwort",
+"Allow Public Upload" => "Öffentliches Hochladen erlauben",
"Email link to person" => "Link per E-Mail verschicken",
"Send" => "Senden",
"Set expiration date" => "Setze ein Ablaufdatum",