diff options
| author | marudor <marudor@marudor.de> | 2018-02-08 22:57:41 +0100 |
|---|---|---|
| committer | marudor <marudor@marudor.de> | 2018-02-08 22:57:41 +0100 |
| commit | 71b41847e6247471abb957b5859605d9f92fb77e (patch) | |
| tree | 4b5fa812949a4f91b2ed347d9320c9143633f99a /locale | |
| parent | 7af09433def2fda9ec47b12823b16e3392b5f6cf (diff) | |
| parent | 6dbec2e2fb64ad8a2f9ae1c9271a401e097a989f (diff) | |
Merge remote-tracking branch 'origin/master'
# Conflicts:
# public/css/theme0.css
# public/css/theme1.css
# public/css/theme2.css
# public/css/theme3.css
# public/css/theme4.css
# public/css/theme5.css
# public/css/theme6.css
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/de_DE.UTF-8/LC_MESSAGES/default.po | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.po b/locale/de_DE.UTF-8/LC_MESSAGES/default.po index 7187b32c..61bcbcbb 100644 --- a/locale/de_DE.UTF-8/LC_MESSAGES/default.po +++ b/locale/de_DE.UTF-8/LC_MESSAGES/default.po @@ -2696,8 +2696,8 @@ msgstr "Nächste Schicht %c" #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:302 #, php-format -msgid "Shift starts %c" -msgstr "Schicht startet %c" +msgid "Shift started %c" +msgstr "Schicht startete %c" #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:307 #, php-format |