diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-10-17 16:38:11 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-10-17 16:38:11 +0200 |
| commit | 6081bfa2bcbe121e373486273ecce58a49e6fa97 (patch) | |
| tree | f2504800c66919a53eff9323724b493079569495 /settings/languageCodes.php | |
| parent | c2b4e534534e083147bbad9b564179832cfa2912 (diff) | |
| parent | 44287d680bd0e8799724a7595db43c0fafcaff40 (diff) | |
| download | nextcloud-server-6081bfa2bcbe121e373486273ecce58a49e6fa97.tar.gz nextcloud-server-6081bfa2bcbe121e373486273ecce58a49e6fa97.zip | |
Merge branch 'master' into routing
Conflicts:
lib/search/provider/file.php
settings/ajax/changepassword.php
settings/settings.php
Diffstat (limited to 'settings/languageCodes.php')
| -rw-r--r-- | settings/languageCodes.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/settings/languageCodes.php b/settings/languageCodes.php index 6d3b6ebe634..221aa13cf6a 100644 --- a/settings/languageCodes.php +++ b/settings/languageCodes.php @@ -9,7 +9,8 @@ return array( 'ca'=>'Català', 'cs_CZ'=>'Čeština', 'da'=>'Dansk', -'de'=>'Deutsch', +'de'=>'Deutsch (Persönlich)', +'de_DE'=>'Deutsch (Förmlich)', 'el'=>'Ελληνικά', 'en'=>'English', 'es'=>'Español', |