From 5a9a256f2623810589c9510f73abbbffe50d7841 Mon Sep 17 00:00:00 2001
From: Nos-
Date: Mon, 27 Aug 2018 22:18:09 +0200
Subject: Improved german translation.
---
locale/de_DE.UTF-8/LC_MESSAGES/default.mo | Bin 44974 -> 45011 bytes
locale/de_DE.UTF-8/LC_MESSAGES/default.po | 29 +++++++++++++++--------------
2 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo
index 3939e870..e976f510 100644
Binary files a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo and b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo differ
diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.po b/locale/de_DE.UTF-8/LC_MESSAGES/default.po
index 61bcbcbb..f1edf009 100644
--- a/locale/de_DE.UTF-8/LC_MESSAGES/default.po
+++ b/locale/de_DE.UTF-8/LC_MESSAGES/default.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Engelsystem 2.0\n"
"POT-Creation-Date: 2017-12-29 19:01+0100\n"
-"PO-Revision-Date: 2017-12-29 19:03+0100\n"
+"PO-Revision-Date: 2018-08-27 22:16+0200\n"
"Last-Translator: msquare \n"
"Language-Team: \n"
"Language: de_DE\n"
@@ -165,7 +165,7 @@ msgstr "Einstellungen gespeichert."
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:274
#: /Users/msquare/workspace/projects/engelsystem/includes/view/PublicDashboard_view.php:55
msgid "Public Dashboard"
-msgstr "Public Dashboard"
+msgstr "Öffentliches Dashboard"
#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:109
#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:181
@@ -589,17 +589,17 @@ msgstr "%s löschen"
#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:160
msgid "Please enter a valid number of vouchers."
-msgstr "Bitte gib eine korrekte Anzahl von Vouchern ein."
+msgstr "Bitte gib eine korrekte Anzahl von Gutscheinen ein."
#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:168
msgid "Saved the number of vouchers."
-msgstr "Anzahl der Voucher gespeichert."
+msgstr "Anzahl der Gutscheine gespeichert."
#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:177
#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:170
#, php-format
msgid "%s's vouchers"
-msgstr "Voucher von %s"
+msgstr "Gutschein von %s"
#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:194
msgid "User not found."
@@ -1599,7 +1599,7 @@ msgstr ""
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:321
#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:60
msgid "Humans are allowed to send me an email (e.g. for ticket vouchers)"
-msgstr "Menschen dürfen mir eine E-Mail senden (z.B. für Ticket Voucher)"
+msgstr "Menschen dürfen mir eine E-Mail senden (z.B. für Ticket Gutscheine)"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:330
#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:36
@@ -2341,6 +2341,7 @@ msgstr "Eintragen"
msgid "ended"
msgstr "vorbei"
+# Wie ist dies zu verstehen bitte?
#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:205
msgid "please arrive for signup"
msgstr "Ankommen zum Eintragen"
@@ -2639,11 +2640,11 @@ msgstr "Dein Passwort"
#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:176
#, php-format
msgid "Angel should receive at least %d vouchers."
-msgstr "Engel sollte mindestens %d Voucher bekommen."
+msgstr "Engel sollte mindestens %d Gutscheine bekommen."
#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:181
msgid "Number of vouchers given out"
-msgstr "Anzahl Voucher bekommen"
+msgstr "Anzahl Gutscheine bekommen"
#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:216
msgid "m/d/Y h:i a"
@@ -2664,7 +2665,7 @@ msgstr "Angekommen"
#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:243
msgid "Voucher"
-msgstr "Voucher"
+msgstr "Gutschein"
#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:244
msgid "Freeloads"
@@ -2727,7 +2728,7 @@ msgstr "Erstellt von %s am %s"
#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:524
msgid "Day & time"
-msgstr "Day & time"
+msgstr "Tag & Zeit"
#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:525
msgid "Duration"
@@ -2751,7 +2752,7 @@ msgstr "Führerschein"
#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:562
msgid "Edit vouchers"
-msgstr "Voucher bearbeiten"
+msgstr "Gutschein bearbeiten"
#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:566
msgid "Add work log"
@@ -2808,12 +2809,12 @@ msgstr "Nicht angekommen (Geplant: %s)"
#, php-format
msgid "Got %s voucher"
msgid_plural "Got %s vouchers"
-msgstr[0] "Einen Voucher bekommen"
-msgstr[1] "%s Voucher bekommen"
+msgstr[0] "Einen Gutschein bekommen"
+msgstr[1] "%s Gutscheine bekommen"
#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:701
msgid "Got no vouchers"
-msgstr "Voucher nicht bekommen"
+msgstr "Gutschein nicht bekommen"
#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:716
msgid ""
--
cgit v1.2.3-54-g00ecf
From ee3e4193c5a3e16a40b0a809064bb58a4018b496 Mon Sep 17 00:00:00 2001
From: Nos-
Date: Mon, 27 Aug 2018 22:26:20 +0200
Subject: Commented the german translation according to Issue #312 .
---
locale/de_DE.UTF-8/LC_MESSAGES/default.mo | Bin 45011 -> 45011 bytes
locale/de_DE.UTF-8/LC_MESSAGES/default.po | 3 ++-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo
index e976f510..57c42f1c 100644
Binary files a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo and b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo differ
diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.po b/locale/de_DE.UTF-8/LC_MESSAGES/default.po
index f1edf009..805acbe9 100644
--- a/locale/de_DE.UTF-8/LC_MESSAGES/default.po
+++ b/locale/de_DE.UTF-8/LC_MESSAGES/default.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Engelsystem 2.0\n"
"POT-Creation-Date: 2017-12-29 19:01+0100\n"
-"PO-Revision-Date: 2018-08-27 22:16+0200\n"
+"PO-Revision-Date: 2018-08-27 22:26+0200\n"
"Last-Translator: msquare \n"
"Language-Team: \n"
"Language: de_DE\n"
@@ -110,6 +110,7 @@ msgstr "löschen"
msgid "leave"
msgstr "verlassen"
+# As already mentioned in Issue #312 : I'd suggest "join angel" and the German translation "Engel hinzufügen" for this button.
#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:322
#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:151
#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:540
--
cgit v1.2.3-54-g00ecf
From ac6361b51bed8f9d3b540c2604d6750bf5ada535 Mon Sep 17 00:00:00 2001
From: Nos-
Date: Tue, 28 Aug 2018 00:39:11 +0200
Subject: Tried to fix inputfields for date, email, tel
---
includes/pages/admin_user.php | 8 ++++----
includes/sys_form.php | 2 +-
templates/user_shifts.html | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/includes/pages/admin_user.php b/includes/pages/admin_user.php
index 8da09e81..0fb05ffb 100644
--- a/includes/pages/admin_user.php
+++ b/includes/pages/admin_user.php
@@ -59,12 +59,12 @@ function admin_user()
. '
' . "\n";
$html .= ' Name | ' . ' |
' . "\n";
$html .= ' Vorname | ' . ' |
' . "\n";
- $html .= ' Alter | ' . ' |
' . "\n";
- $html .= ' Telefon | ' . ' |
' . "\n";
- $html .= ' Handy | ' . ' |
' . "\n";
+ $html .= ' Alter | ' . ' |
' . "\n";
+ $html .= ' Telefon | ' . ' |
' . "\n";
+ $html .= ' Handy | ' . ' |
' . "\n";
$html .= ' DECT | ' . ' |
' . "\n";
if ($user_source['email_by_human_allowed']) {
- $html .= " email | " . ' |
' . "\n";
+ $html .= " email | " . ' |
' . "\n";
}
$html .= " jabber | " . ' |
' . "\n";
$html .= ' Size | '
diff --git a/includes/sys_form.php b/includes/sys_form.php
index c974c1d1..ef0c877a 100644
--- a/includes/sys_form.php
+++ b/includes/sys_form.php
@@ -68,7 +68,7 @@ function form_date($name, $label, $value, $start_date = '', $end_date = '')
$end_date = is_numeric($end_date) ? date('Y-m-d', $end_date) : '';
return form_element($label, '
- '
+ '
. '' . glyph('th') . '
|