diff options
| author | Thomas Tanghus <thomas@tanghus.net> | 2012-11-04 12:31:06 +0100 |
|---|---|---|
| committer | Thomas Tanghus <thomas@tanghus.net> | 2012-11-04 12:31:06 +0100 |
| commit | e6a7bba0950688d73f52cd622bdf6ec62dff9281 (patch) | |
| tree | aec719c0af896e1f47c0475f13ed2355dbf34f4f /apps/files/l10n/de.php | |
| parent | 8e5b6bf21d14b6022e543869cba503bb582b1cb5 (diff) | |
| parent | 17d466b03b91ccc058fe1a88340df36c22a580c2 (diff) | |
| download | nextcloud-server-e6a7bba0950688d73f52cd622bdf6ec62dff9281.tar.gz nextcloud-server-e6a7bba0950688d73f52cd622bdf6ec62dff9281.zip | |
Merge branch 'master' of github.com:owncloud/core into vcategories_db
Conflicts:
lib/vcategories.php
Diffstat (limited to 'apps/files/l10n/de.php')
| -rw-r--r-- | apps/files/l10n/de.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php index 7dc5831e639..f27565398b2 100644 --- a/apps/files/l10n/de.php +++ b/apps/files/l10n/de.php @@ -58,7 +58,7 @@ "New" => "Neu", "Text file" => "Textdatei", "Folder" => "Ordner", -"From url" => "Von einer URL", +"From link" => "Von einem Link", "Upload" => "Hochladen", "Cancel upload" => "Upload abbrechen", "Nothing in here. Upload something!" => "Alles leer. Lade etwas hoch!", |