diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2015-11-04 20:17:29 +0100 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2015-11-04 20:17:29 +0100 |
| commit | a1267baa0b1caa801547ee674d9bb03c4b15d00b (patch) | |
| tree | 78c5567578751752a3623574cbd768e602a46754 /app/i18n/de | |
| parent | 133e369afff02e5984fe4ce5109e33fd2fbccfc7 (diff) | |
| parent | 4525e547faa8781e37f86125110f28248eb67fd3 (diff) | |
Merge branch 'dev' into beta
Diffstat (limited to 'app/i18n/de')
| -rw-r--r-- | app/i18n/de/admin.php | 1 | ||||
| -rw-r--r-- | app/i18n/de/gen.php | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/app/i18n/de/admin.php b/app/i18n/de/admin.php index 395b51acf..6e6cc0956 100644 --- a/app/i18n/de/admin.php +++ b/app/i18n/de/admin.php @@ -148,6 +148,7 @@ return array( ), 'system' => array( '_' => 'System configuration', // @todo translate + 'auto-update-url' => 'Auto-update server URL', // @todo translate 'instance-name' => 'Instance name', // @todo translate 'max-categories' => 'Categories per user limit', // @todo translate 'max-feeds' => 'Feeds per user limit', // @todo translate diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php index 38beb5016..842383498 100644 --- a/app/i18n/de/gen.php +++ b/app/i18n/de/gen.php @@ -120,6 +120,7 @@ return array( 'de' => 'Deutsch', 'en' => 'English', 'fr' => 'Français', + 'it' => 'Italiano', 'nl' => 'Nederlands', ), 'menu' => array( @@ -158,6 +159,7 @@ return array( 'email' => 'E-Mail', 'facebook' => 'Facebook', 'g+' => 'Google+', + 'movim' => 'Movim', 'print' => 'Drucken', 'shaarli' => 'Shaarli', 'twitter' => 'Twitter', |