diff options
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/de_DE.UTF-8/LC_MESSAGES/default.mo | bin | 40425 -> 40976 bytes | |||
| -rw-r--r-- | locale/de_DE.UTF-8/LC_MESSAGES/default.po | 1775 |
2 files changed, 1768 insertions, 7 deletions
diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo Binary files differindex 6ed598d8..07cf1c15 100644 --- a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo +++ b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.po b/locale/de_DE.UTF-8/LC_MESSAGES/default.po index 4d76e486..e17c9f34 100644 --- a/locale/de_DE.UTF-8/LC_MESSAGES/default.po +++ b/locale/de_DE.UTF-8/LC_MESSAGES/default.po @@ -1,8 +1,13 @@ msgid "" msgstr "" "Project-Id-Version: Engelsystem 2.0\n" +<<<<<<< HEAD +"POT-Creation-Date: 2016-11-14 18:01+0100\n" +"PO-Revision-Date: 2016-11-14 18:02+0100\n" +======= "POT-Creation-Date: 2016-11-14 19:36+0100\n" "PO-Revision-Date: 2016-11-14 19:39+0100\n" +>>>>>>> pr/276 "Last-Translator: msquare <msquare@notrademark.de>\n" "Language-Team: \n" "Language: de_DE\n" @@ -18,6 +23,80 @@ msgstr "" "X-Poedit-SearchPath-1: .\n" "X-Poedit-SearchPathExcluded-0: vendor\n" +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:56 +msgid "" +"Please enter your planned date of departure on your settings page to give us " +"a feeling for teardown capacities." +msgstr "" +"Bitte gib Dein geplantes Abreisedatum an, damit wir ein Gefühl für die Abbau-" +"Planung bekommen." + +#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:65 +#, php-format +msgid "" +"You freeloaded at least %s shifts. Shift signup is locked. Please go to " +"heavens desk to be unlocked again." +msgstr "" +"Du hast mindestens %s Schichten geschwänzt. Schicht-Registrierung ist " +"gesperrt. Bitte gehe zum Himmelsschreibtisch um wieder entsperrt zu werden." + +#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:72 +msgid "" +"You are not marked as arrived. Please go to heaven's desk, get your angel " +"badge and/or tell them that you arrived already." +msgstr "" +"Du bist nicht als angekommen markiert. Bitte gehe zur Himmelsverwaltung, " +"hole Dein Badge ab und/oder erkläre ihnen, dass Du bereits angekommen bist." + +#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:78 +msgid "You need to specify a tshirt size in your settings!" +msgstr "Bitte eine T-Shirt-Größe auswählen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:84 +msgid "" +"You need to specify a DECT phone number in your settings! If you don't have " +"a DECT phone, just enter \"-\"." +msgstr "" +"Bitte eine DECT-Telefonnummer in den Einstellungen eingeben. Wenn du noch " +"keine Nummer hast, bitte einfach \"-\" angeben." + +#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:157 +msgid "Admin" +msgstr "Admin" + +#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:179 +msgid "Manage rooms" +msgstr "Verwalte Räume" + +#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:188 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:4 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:166 +msgid "Rooms" +msgstr "Räume" + +#: /Users/msquare/workspace/projects/engelsystem/includes/sys_template.php:385 +msgid "No data found." +msgstr "Nichts gefunden." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:7 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:171 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:53 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:73 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:317 +msgid "Angeltypes" +msgstr "Engeltypen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:55 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:351 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:252 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:312 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:110 +msgid "Teams/Job description" +msgstr "Team-/Aufgabenbeschreibung" + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:82 +======= #: includes/controller/angeltypes_controller.php:7 #: includes/pages/user_shifts.php:886 includes/view/AngelTypes_view.php:53 #: includes/view/AngelTypes_view.php:70 includes/view/User_view.php:257 @@ -31,32 +110,284 @@ msgid "Teams/Job description" msgstr "Team-/Aufgabenbeschreibung" #: includes/controller/angeltypes_controller.php:88 +>>>>>>> pr/276 #, php-format msgid "Angeltype %s deleted." msgstr "Engeltyp %s gelöscht." +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:87 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:41 +======= #: includes/controller/angeltypes_controller.php:93 #: includes/view/AngelTypes_view.php:41 +>>>>>>> pr/276 #, php-format msgid "Delete angeltype %s" msgstr "Lösche Engeltyp %s" +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:136 +msgid "Please check the name. Maybe it already exists." +msgstr "Bitte überprüfe den Namen. Vielleicht ist er bereits vergeben." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:170 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:51 +======= #: includes/controller/angeltypes_controller.php:145 msgid "Please check the name. Maybe it already exists." msgstr "Bitte überprüfe den Namen. Vielleicht ist er bereits vergeben." #: includes/controller/angeltypes_controller.php:179 #: includes/view/AngelTypes_view.php:51 +>>>>>>> pr/276 #, php-format msgid "Edit %s" msgstr "%s bearbeiten" +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:202 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:239 +======= #: includes/controller/angeltypes_controller.php:222 #: includes/view/AngelTypes_view.php:209 +>>>>>>> pr/276 #, php-format msgid "Team %s" msgstr "Team %s" +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:221 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:270 +msgid "view" +msgstr "ansehen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:225 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:71 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:23 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:16 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:94 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:81 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:55 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:66 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:273 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:328 +msgid "edit" +msgstr "bearbeiten" + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:226 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:177 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:37 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:51 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:17 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:120 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:45 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:97 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:5 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:12 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:82 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:16 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:56 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:67 +msgid "delete" +msgstr "löschen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:231 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:90 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:274 +msgid "leave" +msgstr "verlassen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:233 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:81 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:276 +msgid "join" +msgstr "mitmachen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:258 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:29 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:35 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:65 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:71 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:119 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:170 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:235 +msgid "Angeltype doesn't exist." +msgstr "Engeltyp existiert nicht." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:4 +msgid "Event config" +msgstr "Event Einstellungen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:48 +msgid "Please enter buildup start date." +msgstr "Bitte gib das Aufbau Start Datum an." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:52 +msgid "Please enter event start date." +msgstr "Bitte gib das Event Start Datum an." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:56 +msgid "Please enter event end date." +msgstr "Bitte gib das Event Ende Datum an." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:60 +msgid "Please enter teardown end date." +msgstr "Bitte gib das Abbau Ende Datum an." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:66 +msgid "The buildup start date has to be before the event start date." +msgstr "Das Aufbau Start Datum muss vor dem Event Start Datum liegen." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:71 +msgid "The event start date has to be before the event end date." +msgstr "Das Event Start Datum muss vor dem Event End Datum liegen." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:76 +msgid "The event end date has to be before the teardown end date." +msgstr "Das Event Ende Datum muss vor dem Abbau Ende Datum liegen." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:81 +msgid "The buildup start date has to be before the teardown end date." +msgstr "Das Aufbau Start Datum muss vor dem Abbau Ende Datum liegen." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:92 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:77 +msgid "Settings saved." +msgstr "Einstellungen gespeichert." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:47 +msgid "" +"You are not allowed to sign up for this shift. Maybe shift is full or " +"already running." +msgstr "" +"Du darfst Dich nicht für diese Schicht eintragen. Vielleicht ist die Schicht " +"voll oder sie läuft bereits." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:101 +msgid "You are subscribed. Thank you!" +msgstr "Du bist eingetragen. Danke!" + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:101 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:4 +msgid "My shifts" +msgstr "Meine Schichten" + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:110 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:309 +msgid "Freeloader" +msgstr "Schwänzer" + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:161 +msgid "Shift entry deleted." +msgstr "Schicht-Eintrag gelöscht." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:163 +msgid "Entry not found." +msgstr "Eintrag nicht gefunden." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:62 +msgid "Please select a room." +msgstr "Bitte einen Raum auswählen." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:69 +msgid "Please select a shifttype." +msgstr "Bitte einen Schichttyp wählen." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:76 +msgid "Please enter a valid starting time for the shifts." +msgstr "Bitte gib eine korrekte Startzeit für die Schichten ein." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:83 +msgid "Please enter a valid ending time for the shifts." +msgstr "Bitte gib eine korrekte Endzeit für die Schichten ein." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:88 +msgid "The ending time has to be after the starting time." +msgstr "Die Endzeit muss nach der Startzeit liegen." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:96 +#, php-format +msgid "Please check your input for needed angels of type %s." +msgstr "Bitte prüfe deine Eingabe für benötigte Engel des Typs %s." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:119 +msgid "Shift updated." +msgstr "Schicht aktualisiert." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:134 +msgid "This page is much more comfortable with javascript." +msgstr "Diese Seite ist mit JavaScript viel komfortabler." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:136 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:97 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:319 +msgid "Shifttype" +msgstr "Schichttyp" + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:137 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:157 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:166 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:175 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:320 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:88 +msgid "Title" +msgstr "Titel" + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:138 +msgid "Room:" +msgstr "Raum:" + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:139 +msgid "Start:" +msgstr "Start:" + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:140 +msgid "End:" +msgstr "Ende:" + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:141 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:270 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:334 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:114 +msgid "Needed angels" +msgstr "Benötigte Engel" + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:143 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:54 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:35 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:35 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:157 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:272 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:44 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:107 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:164 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:63 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:106 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:32 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:32 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:39 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:56 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:65 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:70 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:75 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:146 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:377 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:34 +msgid "Save" +msgstr "Speichern" + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:171 +msgid "Shift deleted." +msgstr "Schicht gelöscht." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:176 +#, php-format +msgid "Do you want to delete the shift %s from %s to %s?" +msgstr "Möchtest Du die Schicht %s von %s bis %s löschen?" + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:194 +======= #: includes/controller/angeltypes_controller.php:244 #: includes/view/User_view.php:210 msgid "view" @@ -145,6 +476,7 @@ msgid "Settings saved." msgstr "Einstellungen gespeichert." #: includes/controller/shifts_controller.php:31 +>>>>>>> pr/276 msgid "Shift could not be found." msgstr "Schicht konnte nicht gefunden werden." @@ -159,6 +491,30 @@ msgstr "Schichttyp %s gelöscht." msgid "Delete shifttype %s" msgstr "Lösche Schichttyp %s" +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:58 +msgid "Shifttype not found." +msgstr "Schichttyp nicht gefunden." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:74 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:71 +msgid "Please enter a name." +msgstr "Gib bitte einen Namen an." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:94 +msgid "Updated shifttype." +msgstr "Schichttyp geändert." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:101 +msgid "Created shifttype." +msgstr "Schichttyp erstellt." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:155 +msgid "Shifttypes" +msgstr "Schichttypen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:19 +======= #: includes/controller/shifttypes_controller.php:61 msgid "Shifttype not found." msgstr "Schichttyp nicht gefunden." @@ -181,12 +537,24 @@ msgid "Shifttypes" msgstr "Schichttypen" #: includes/controller/user_angeltypes_controller.php:22 +>>>>>>> pr/276 #, php-format msgid "There is %d unconfirmed angeltype." msgid_plural "There are %d unconfirmed angeltypes." msgstr[0] "Es gibt %d nicht freigeschalteten Engeltypen!" msgstr[1] "Es gibt %d nicht freigeschaltete Engeltypen!" +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:19 +msgid "Angel types which need approvals:" +msgstr "Engeltypen die bestätigt werden müssen:" + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:40 +msgid "You are not allowed to delete all users for this angeltype." +msgstr "Du darfst nicht alle Benutzer von diesem Engeltyp entfernen." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:48 +======= #: includes/controller/user_angeltypes_controller.php:22 msgid "Angel types which need approvals:" msgstr "Engeltypen die bestätigt werden müssen:" @@ -196,10 +564,33 @@ msgid "You are not allowed to delete all users for this angeltype." msgstr "Du darfst nicht alle Benutzer von diesem Engeltyp entfernen." #: includes/controller/user_angeltypes_controller.php:57 +>>>>>>> pr/276 #, php-format msgid "Denied all users for angeltype %s." msgstr "Alle Benutzer mit Engeltyp %s abgelehnt." +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:53 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:15 +msgid "Deny all users" +msgstr "Alle Benutzer ablehnen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:77 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:107 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:113 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:158 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:164 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:216 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:229 +msgid "User angeltype doesn't exist." +msgstr "Benutzer-Engeltype existiert nicht." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:82 +msgid "You are not allowed to confirm all users for this angeltype." +msgstr "Du darfst nicht alle Benutzer für diesen Engeltyp freischalten." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:90 +======= #: includes/controller/user_angeltypes_controller.php:62 #: includes/view/UserAngelTypes_view.php:15 msgid "Deny all users" @@ -220,10 +611,30 @@ msgid "You are not allowed to confirm all users for this angeltype." msgstr "Du darfst nicht alle Benutzer für diesen Engeltyp freischalten." #: includes/controller/user_angeltypes_controller.php:108 +>>>>>>> pr/276 #, php-format msgid "Confirmed all users for angeltype %s." msgstr "Alle Benutzer für Engeltyp %s freigeschaltet." +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:95 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:26 +msgid "Confirm all users" +msgstr "Alle Benutzer bestätigen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:124 +msgid "You are not allowed to confirm this users angeltype." +msgstr "Du darfst diesen Benutzer nicht für diesen Engeltyp freischalten." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:130 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:176 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:241 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:312 +msgid "User doesn't exist." +msgstr "Benutzer existiert nicht." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:141 +======= #: includes/controller/user_angeltypes_controller.php:113 #: includes/view/UserAngelTypes_view.php:26 msgid "Confirm all users" @@ -241,10 +652,23 @@ msgid "User doesn't exist." msgstr "Benutzer existiert nicht." #: includes/controller/user_angeltypes_controller.php:168 +>>>>>>> pr/276 #, php-format msgid "%s confirmed for angeltype %s." msgstr "%s für Engeltyp %s freigeschaltet." +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:146 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:37 +msgid "Confirm angeltype for user" +msgstr "Engeltyp für Benutzer bestätigen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:181 +msgid "You are not allowed to delete this users angeltype." +msgstr "Du darfst diesen Benutzer nicht von diesem Engeltyp entfernen." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:191 +======= #: includes/controller/user_angeltypes_controller.php:173 #: includes/view/UserAngelTypes_view.php:37 msgid "Confirm angeltype for user" @@ -255,10 +679,27 @@ msgid "You are not allowed to delete this users angeltype." msgstr "Du darfst diesen Benutzer nicht von diesem Engeltyp entfernen." #: includes/controller/user_angeltypes_controller.php:227 +>>>>>>> pr/276 #, php-format msgid "User %s removed from %s." msgstr "Benutzer %s von %s entfernt." +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:199 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:48 +msgid "Remove angeltype" +msgstr "Engeltyp löschen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:211 +msgid "You are not allowed to set supporter rights." +msgstr "Du darfst keine Supporterrechte bearbeiten." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:223 +msgid "No supporter update given." +msgstr "Kein Update für Supporterrechte gegeben." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:248 +======= #: includes/controller/user_angeltypes_controller.php:235 #: includes/view/UserAngelTypes_view.php:48 msgid "Remove angeltype" @@ -273,15 +714,35 @@ msgid "No coordinator update given." msgstr "Kein Update für Koordinationsrechte gegeben." #: includes/controller/user_angeltypes_controller.php:296 +>>>>>>> pr/276 #, php-format -msgid "Added coordinator rights for %s to %s." -msgstr "%s hat %s als Koordinator bekommen." +msgid "Added supporter rights for %s to %s." +msgstr "%s hat %s als Supporter bekommen." +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:248 +======= #: includes/controller/user_angeltypes_controller.php:296 +>>>>>>> pr/276 #, php-format -msgid "Removed coordinator rights for %s from %s." -msgstr "%s hat jetzt nicht mehr %s als Koordinator." - +msgid "Removed supporter rights for %s from %s." +msgstr "%s hat jetzt nicht mehr %s als Supporter." + +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:256 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:143 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:4 +msgid "Add supporter rights" +msgstr "Supporterrechte geben" + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:256 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:134 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:4 +msgid "Remove supporter rights" +msgstr "Supporterrechte entfernen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:289 +======= #: includes/controller/user_angeltypes_controller.php:304 #: includes/view/AngelTypes_view.php:142 #: includes/view/UserAngelTypes_view.php:4 @@ -295,32 +756,55 @@ msgid "Remove coordinator rights" msgstr "Koordinatorrechte entfernen" #: includes/controller/user_angeltypes_controller.php:343 +>>>>>>> pr/276 #, php-format msgid "User %s added to %s." msgstr "Benutzer %s zu %s hinzugefügt." +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:299 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:64 +msgid "Add user to angeltype" +msgstr "Benutzer zu Engeltyp hinzufügen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:312 +======= #: includes/controller/user_angeltypes_controller.php:356 #: includes/view/UserAngelTypes_view.php:64 msgid "Add user to angeltype" msgstr "Benutzer zu Engeltyp hinzufügen" #: includes/controller/user_angeltypes_controller.php:372 +>>>>>>> pr/276 #, php-format msgid "You are already a %s." msgstr "Du bist bereits %s." +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:319 +======= #: includes/controller/user_angeltypes_controller.php:382 +>>>>>>> pr/276 #, php-format msgid "You joined %s." msgstr "Du bist %s beigetreten." +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:332 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:78 +======= #: includes/controller/user_angeltypes_controller.php:398 #: includes/view/UserAngelTypes_view.php:78 +>>>>>>> pr/276 #, php-format msgid "Become a %s" msgstr "Werde ein %s" +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:19 +======= #: includes/controller/user_driver_licenses_controller.php:27 +>>>>>>> pr/276 #, php-format msgid "" "You joined an angeltype which requires a driving license. Please edit your " @@ -329,6 +813,26 @@ msgstr "" "Du bist einem Engeltypen beigetreten, der Führerschein-Infos benötigt. Bitte " "trage Deine Führerschein-Infos hier ein: %s." +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:19 +msgid "driving license information" +msgstr "Führerschein-Infos" + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:121 +msgid "Please select at least one driving license." +msgstr "Bitte wähle mindestens einen Führerschein-Typen aus." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:128 +msgid "Your driver license information has been removed." +msgstr "Deine Führerschein-Infos wurden gelöscht." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:138 +msgid "Your driver license information has been saved." +msgstr "Deine Führerschein-Infos wurden gespeichert." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:146 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:15 +======= #: includes/controller/user_driver_licenses_controller.php:27 msgid "driving license information" msgstr "Führerschein-Infos" @@ -347,6 +851,7 @@ msgstr "Deine Führerschein-Infos wurden gespeichert." #: includes/controller/user_driver_licenses_controller.php:155 #: includes/view/UserDriverLicenses_view.php:15 +>>>>>>> pr/276 #, php-format msgid "Edit %s driving license information" msgstr "Bearbeite die Führerschein-Infos von %s" @@ -355,8 +860,13 @@ msgstr "Bearbeite die Führerschein-Infos von %s" msgid "You cannot delete yourself." msgstr "Du kannst Dich nicht selber löschen." +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:59 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:301 +======= #: includes/controller/users_controller.php:59 #: includes/pages/guest_login.php:297 +>>>>>>> pr/276 msgid "Your password is incorrect. Please try it again." msgstr "Dein Passwort stimmt nicht. Bitte probiere es nochmal." @@ -364,7 +874,12 @@ msgstr "Dein Passwort stimmt nicht. Bitte probiere es nochmal." msgid "User deleted." msgstr "Engel gelöscht." +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:77 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:121 +======= #: includes/controller/users_controller.php:77 includes/view/User_view.php:61 +>>>>>>> pr/276 #, php-format msgid "Delete %s" msgstr "%s löschen" @@ -377,11 +892,70 @@ msgstr "Bitte gib eine korrekte Anzahl von Vouchern ein." msgid "Saved the number of vouchers." msgstr "Anzahl der Voucher gespeichert." +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:137 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:138 +======= #: includes/controller/users_controller.php:137 includes/view/User_view.php:78 +>>>>>>> pr/276 #, php-format msgid "%s's vouchers" msgstr "Voucher von %s" +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:149 +msgid "User not found." +msgstr "Benutzer nicht gefunden." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:203 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:175 +msgid "All users" +msgstr "Alle Benutzer" + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:219 +msgid "Token is not correct." +msgstr "Der Token ist nicht in Ordnung." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:229 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:102 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:94 +msgid "Your passwords don't match." +msgstr "Deine Passwörter stimmen nicht überein." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:233 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:92 +msgid "Your password is to short (please use at least 6 characters)." +msgstr "Dein Passwort ist zu kurz (Bitte mindestens 6 Zeichen nutzen)." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:239 +msgid "Password could not be updated." +msgstr "Passwort kann nicht neu gesetzt werden." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:242 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:96 +msgid "Password saved." +msgstr "Passwort gespeichert." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:261 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:265 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:67 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:21 +msgid "E-mail address is not correct." +msgstr "Die E-Mail Adresse ist nicht in Ordnung." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:269 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:71 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:25 +msgid "Please enter your e-mail." +msgstr "Bitte gib Deine E-Mail-Adresse ein." + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:277 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:295 +msgid "Password recovery" +msgstr "Passwort wiederherstellen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:277 +======= #: includes/controller/users_controller.php:151 msgid "User not found." msgstr "Benutzer nicht gefunden." @@ -430,11 +1004,16 @@ msgid "Password recovery" msgstr "Passwort wiederherstellen" #: includes/controller/users_controller.php:281 +>>>>>>> pr/276 #, php-format msgid "Please visit %s to recover your password." msgstr "Bitte besuche %s, um Dein Passwort zurückzusetzen" +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:282 +======= #: includes/controller/users_controller.php:286 +>>>>>>> pr/276 msgid "We sent an email containing your password recovery link." msgstr "" "Wir haben eine eMail mit einem Link zum Passwort-zurücksetzen geschickt." @@ -551,10 +1130,20 @@ msgstr "" msgid "Marked angels." msgstr "Engel wurden markiert." +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:61 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:137 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:173 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:266 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:124 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:141 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:67 +======= #: includes/pages/admin_active.php:61 includes/pages/admin_rooms.php:136 #: includes/pages/admin_rooms.php:172 includes/pages/admin_shifts.php:266 #: includes/view/UserAngelTypes_view.php:67 includes/view/User_view.php:64 #: includes/view/User_view.php:81 +>>>>>>> pr/276 msgid "back" msgstr "zurück" @@ -600,10 +1189,20 @@ msgstr "hat t-shirt" msgid "remove t-shirt" msgstr "entferne t-shirt" +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:170 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:165 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:180 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:195 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:208 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:216 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:165 +======= #: includes/pages/admin_active.php:170 includes/pages/admin_arrive.php:165 #: includes/pages/admin_arrive.php:180 includes/pages/admin_arrive.php:195 #: includes/view/AngelTypes_view.php:178 includes/view/AngelTypes_view.php:186 #: includes/view/User_view.php:105 +>>>>>>> pr/276 msgid "Sum" msgstr "Summe" @@ -615,10 +1214,20 @@ msgstr "Suche Engel:" msgid "Show all shifts" msgstr "Alle Schichten anzeigen" +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:179 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:141 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:142 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:78 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:87 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_log.php:23 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_log.php:24 +======= #: includes/pages/admin_active.php:179 includes/pages/admin_arrive.php:141 #: includes/pages/admin_arrive.php:142 includes/pages/admin_free.php:78 #: includes/pages/admin_free.php:87 includes/pages/admin_log.php:23 #: includes/pages/admin_log.php:24 +>>>>>>> pr/276 msgid "Search" msgstr "Suche" @@ -635,6 +1244,17 @@ msgstr "Vorschau" msgid "Nickname" msgstr "Nick" +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:188 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:198 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:191 +msgid "Size" +msgstr "Größe" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:189 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:6 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:339 +======= #: includes/pages/admin_active.php:188 includes/pages/admin_active.php:198 #: includes/view/User_view.php:131 msgid "Size" @@ -642,6 +1262,7 @@ msgstr "Größe" #: includes/pages/admin_active.php:189 includes/pages/user_shifts.php:4 #: includes/view/User_view.php:279 +>>>>>>> pr/276 msgid "Shifts" msgstr "Schichten" @@ -653,7 +1274,12 @@ msgstr "Länge" msgid "Active?" msgstr "Aktiv?" +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:192 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:189 +======= #: includes/pages/admin_active.php:192 includes/view/User_view.php:129 +>>>>>>> pr/276 msgid "Forced" msgstr "Gezwungen" @@ -697,9 +1323,17 @@ msgstr "Ja" msgid "reset" msgstr "zurücksetzen" +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:72 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:156 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:171 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:186 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:330 +======= #: includes/pages/admin_arrive.php:72 includes/pages/admin_arrive.php:156 #: includes/pages/admin_arrive.php:171 includes/pages/admin_arrive.php:186 #: includes/view/User_view.php:270 +>>>>>>> pr/276 msgid "arrived" msgstr "angekommen" @@ -728,9 +1362,17 @@ msgstr "Geplante Ankunfts-Statistik" msgid "arrived sum" msgstr "Summe angekommen" +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:163 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:178 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:193 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:30 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:76 +======= #: includes/pages/admin_arrive.php:163 includes/pages/admin_arrive.php:178 #: includes/pages/admin_arrive.php:193 includes/pages/admin_news.php:30 #: includes/pages/user_messages.php:82 +>>>>>>> pr/276 msgid "Date" msgstr "Datum" @@ -760,6 +1402,38 @@ msgstr "Engeltyp" msgid "Only confirmed" msgstr "Nur bestätigte" +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:92 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:211 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:336 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:164 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:177 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:40 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:97 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:181 +msgid "Nick" +msgstr "Nick" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:94 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:241 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:165 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:178 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:47 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:184 +msgid "DECT" +msgstr "DECT" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:95 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:250 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:52 +msgid "Jabber" +msgstr "Jabber" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:96 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:214 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:49 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:361 +======= #: includes/pages/admin_free.php:92 includes/pages/guest_login.php:208 #: includes/pages/guest_login.php:335 includes/pages/user_settings.php:178 #: includes/view/AngelTypes_view.php:151 includes/view/AngelTypes_view.php:158 @@ -780,6 +1454,7 @@ msgstr "Jabber" #: includes/pages/admin_free.php:96 includes/pages/guest_login.php:211 #: includes/pages/user_settings.php:187 includes/view/User_view.php:301 +>>>>>>> pr/276 msgid "E-Mail" msgstr "E-Mail" @@ -787,11 +1462,24 @@ msgstr "E-Mail" msgid "Grouprights" msgstr "Gruppenrechte" +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:29 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:144 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:148 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:143 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:189 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:57 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:255 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:35 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:77 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:183 +======= #: includes/pages/admin_groups.php:29 includes/pages/admin_import.php:144 #: includes/pages/admin_import.php:148 includes/pages/admin_rooms.php:142 #: includes/pages/admin_rooms.php:188 includes/view/AngelTypes_view.php:57 #: includes/view/AngelTypes_view.php:225 includes/view/ShiftTypes_view.php:35 #: includes/view/ShiftTypes_view.php:77 includes/view/User_view.php:123 +>>>>>>> pr/276 msgid "Name" msgstr "Name" @@ -799,6 +1487,15 @@ msgstr "Name" msgid "Privileges" msgstr "Privilegien" +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:55 +msgid "Edit group" +msgstr "Gruppe bearbeiten" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:4 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:144 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:190 +======= #: includes/pages/admin_groups.php:54 includes/pages/admin_news.php:35 #: includes/pages/admin_questions.php:38 includes/pages/admin_rooms.php:156 #: includes/pages/admin_shifts.php:272 includes/pages/user_messages.php:44 @@ -819,6 +1516,7 @@ msgstr "Gruppe bearbeiten" #: includes/pages/admin_import.php:4 includes/pages/admin_rooms.php:143 #: includes/pages/admin_rooms.php:189 +>>>>>>> pr/276 msgid "Frab import" msgstr "Frab Import" @@ -882,12 +1580,16 @@ msgstr "" "Dieser Import erzeugt, ändert und löscht Räume und Schichten anhand einer " "FRAB-Export Datei. Das benötigte Format ist xcal." +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:98 +======= #: includes/pages/admin_import.php:97 includes/pages/admin_shifts.php:319 #: includes/pages/user_shifts.php:194 msgid "Shifttype" msgstr "Schichttyp" #: includes/pages/admin_import.php:98 +>>>>>>> pr/276 msgid "Add minutes to start" msgstr "Minuten vor Talk-Beginn hinzufügen" @@ -915,6 +1617,28 @@ msgstr "Zu löschende Räume" msgid "Shifts to create" msgstr "Anzulegende Schichten" +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:153 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:162 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:171 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:341 +msgid "Day" +msgstr "Tag" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:154 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:163 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:172 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:324 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:92 +msgid "Start" +msgstr "Beginn" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:155 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:164 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:173 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:325 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:100 +======= #: includes/pages/admin_import.php:153 includes/pages/admin_import.php:162 #: includes/pages/admin_import.php:171 includes/view/User_view.php:281 msgid "Day" @@ -929,6 +1653,7 @@ msgstr "Beginn" #: includes/pages/admin_import.php:155 includes/pages/admin_import.php:164 #: includes/pages/admin_import.php:173 includes/pages/admin_shifts.php:325 #: includes/view/Shifts_view.php:102 +>>>>>>> pr/276 msgid "End" msgstr "Ende" @@ -937,6 +1662,12 @@ msgstr "Ende" msgid "Shift type" msgstr "Schichttyp" +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:158 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:167 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:176 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:321 +======= #: includes/pages/admin_import.php:157 includes/pages/admin_import.php:166 #: includes/pages/admin_import.php:175 includes/pages/admin_shifts.php:320 #: includes/pages/user_shifts.php:195 includes/view/Shifts_view.php:90 @@ -946,6 +1677,7 @@ msgstr "Titel" #: includes/pages/admin_import.php:158 includes/pages/admin_import.php:167 #: includes/pages/admin_import.php:176 includes/pages/admin_shifts.php:321 #: includes/pages/user_shifts.php:867 +>>>>>>> pr/276 msgid "Room" msgstr "Raum" @@ -965,7 +1697,11 @@ msgstr "Erledigt!" msgid "Log" msgstr "Log" +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:10 +======= #: includes/pages/admin_news.php:9 +>>>>>>> pr/276 msgid "Edit news entry" msgstr "News-Eintrag bearbeiten" @@ -973,6 +1709,28 @@ msgstr "News-Eintrag bearbeiten" msgid "Author" msgstr "Autor" +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:32 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:161 +msgid "Subject" +msgstr "Betreff" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:33 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:79 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:106 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:162 +msgid "Message" +msgstr "Nachricht" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:34 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:163 +msgid "Meeting" +msgstr "Treffen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:38 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:177 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:129 +======= #: includes/pages/admin_news.php:32 includes/pages/user_news.php:167 msgid "Subject" msgstr "Betreff" @@ -988,6 +1746,7 @@ msgstr "Treffen" #: includes/pages/admin_news.php:38 includes/pages/admin_rooms.php:176 #: includes/view/User_view.php:69 +>>>>>>> pr/276 msgid "Delete" msgstr "löschen" @@ -1007,6 +1766,45 @@ msgstr "Fragen beantworten" msgid "There are unanswered questions!" msgstr "Es gibt unbeantwortete Fragen!" +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:56 +msgid "Unanswered questions" +msgstr "Unbeantwortete Fragen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:58 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:65 +msgid "From" +msgstr "Von" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:59 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:66 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:19 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:24 +msgid "Question" +msgstr "Frage" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:60 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:68 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:26 +msgid "Answer" +msgstr "Antwort" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:63 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:22 +msgid "Answered questions" +msgstr "Beantwortete Fragen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:67 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:25 +msgid "Answered by" +msgstr "Antwort von" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:67 +msgid "This name is already in use." +msgstr "Dieser Name ist bereits vergeben." + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:97 +======= #: includes/pages/admin_questions.php:66 msgid "Unanswered questions" msgstr "Unbeantwortete Fragen" @@ -1042,10 +1840,31 @@ msgid "This name is already in use." msgstr "Dieser Name ist bereits vergeben." #: includes/pages/admin_rooms.php:93 +>>>>>>> pr/276 #, php-format msgid "Please enter needed angels for type %s." msgstr "Bitte gib die Anzahl der benötigten Engel vom Typ %s an." +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:124 +msgid "Room saved." +msgstr "Raum gespeichert." + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:145 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:191 +msgid "Public" +msgstr "Öffentlich" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:146 +msgid "Room number" +msgstr "Raumnummer" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:151 +msgid "Needed angels:" +msgstr "Benötigte Engel:" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:167 +======= #: includes/pages/admin_rooms.php:123 msgid "Room saved." msgstr "Raum gespeichert." @@ -1063,16 +1882,25 @@ msgid "Needed angels:" msgstr "Benötigte Engel:" #: includes/pages/admin_rooms.php:166 +>>>>>>> pr/276 #, php-format msgid "Room %s deleted." msgstr "Raum %s gelöscht." +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:175 +======= #: includes/pages/admin_rooms.php:174 +>>>>>>> pr/276 #, php-format msgid "Do you want to delete room %s?" msgstr "Möchest Du den Raum %s wirklich löschen?" +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:185 +======= #: includes/pages/admin_rooms.php:184 +>>>>>>> pr/276 msgid "add" msgstr "Neu" @@ -1133,12 +1961,16 @@ msgstr "Zeit und Ort" msgid "Type and title" msgstr "Typ und Titel" +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:326 +======= #: includes/pages/admin_shifts.php:270 includes/pages/admin_shifts.php:334 #: includes/pages/user_shifts.php:199 includes/view/Shifts_view.php:116 msgid "Needed angels" msgstr "Benötigte Engel" #: includes/pages/admin_shifts.php:326 +>>>>>>> pr/276 msgid "Mode" msgstr "Modus" @@ -1170,6 +2002,29 @@ msgstr "Die folgenden Engel werden benötigt" msgid "All Angels" msgstr "Engelliste" +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:20 +msgid "This user does not exist." +msgstr "Benutzer existiert nicht." + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:46 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:58 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:59 +msgid "Yes" +msgstr "Ja" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:47 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:58 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:59 +msgid "No" +msgstr "Nein" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:60 +msgid "Force active" +msgstr "Aktiv erzwingen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:79 +======= #: includes/pages/admin_user.php:23 msgid "This user does not exist." msgstr "Benutzer existiert nicht." @@ -1194,13 +2049,18 @@ msgid "Force active" msgstr "Aktiv erzwingen" #: includes/pages/admin_user.php:81 +>>>>>>> pr/276 msgid "" "Please visit the angeltypes page or the users profile to manage users " "angeltypes." msgstr "" "Bitte benutze die Engeltypen-Seite um die Engeltypen des Users zu verwalten." +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:204 +======= #: includes/pages/admin_user.php:207 +>>>>>>> pr/276 msgid "Edit user" msgstr "User bearbeiten" @@ -1208,12 +2068,24 @@ msgstr "User bearbeiten" msgid "Credits" msgstr "Credits" +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:4 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:338 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:95 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:99 +msgid "Login" +msgstr "Login" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:8 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:271 +======= #: includes/pages/guest_login.php:4 includes/pages/guest_login.php:337 #: includes/view/User_view.php:35 includes/view/User_view.php:39 msgid "Login" msgstr "Login" #: includes/pages/guest_login.php:8 includes/pages/guest_login.php:267 +>>>>>>> pr/276 msgid "Register" msgstr "Registrieren" @@ -1221,16 +2093,36 @@ msgstr "Registrieren" msgid "Logout" msgstr "Logout" +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:56 +======= #: includes/pages/guest_login.php:58 +>>>>>>> pr/276 #, php-format msgid "Your nick "%s" already exists." msgstr "Der Nick "%s" existiert schon." +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:60 +======= #: includes/pages/guest_login.php:62 +>>>>>>> pr/276 #, php-format msgid "Your nick "%s" is too short (min. 2 characters)." msgstr "Der Nick "%s" ist zu kurz (Mindestens 2 Zeichen)." +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:86 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:36 +msgid "Please check your jabber account information." +msgstr "Bitte überprüfe deine Jabber Account Eingabe." + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:95 +msgid "Please select your shirt size." +msgstr "Bitte wähle Deine T-Shirt Größe." + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:106 +======= #: includes/pages/guest_login.php:84 includes/pages/user_settings.php:49 msgid "Please check your jabber account information." msgstr "Bitte überprüfe deine Jabber Account Eingabe." @@ -1240,10 +2132,22 @@ msgid "Please select your shirt size." msgstr "Bitte wähle Deine T-Shirt Größe." #: includes/pages/guest_login.php:104 +>>>>>>> pr/276 #, php-format msgid "Your password is too short (please use at least %s characters)." msgstr "Dein Passwort ist zu kurz (Bitte mindestens %s Zeichen nutzen)." +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:113 +msgid "Please enter your planned date of arrival." +msgstr "Bitte gib Dein geplantes Ankunftsdatum an." + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:186 +msgid "Angel registration successful!" +msgstr "Engel-Registrierung erfolgreich!" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:203 +======= #: includes/pages/guest_login.php:111 includes/pages/user_settings.php:63 msgid "Please enter your planned date of arrival." msgstr "Bitte gib Dein geplantes Ankunftsdatum an." @@ -1253,6 +2157,7 @@ msgid "Angel registration successful!" msgstr "Engel-Registrierung erfolgreich!" #: includes/pages/guest_login.php:200 +>>>>>>> pr/276 msgid "" "By completing this form you're registering as a Chaos-Angel. This script " "will create you an account in the angel task scheduler." @@ -1260,6 +2165,52 @@ msgstr "" "Mit diesem Formular registrierst Du Dich als Engel. Du bekommst ein Konto in " "der Engel-Aufgabenverwaltung." +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:215 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:50 +msgid "" +"The engelsystem is allowed to send me an email (e.g. when my shifts change)" +msgstr "" +"Das Engelsystem darf mir E-Mails senden (z.B. wenn sich meine Schichten " +"ändern)" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:216 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:51 +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)" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:221 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:43 +msgid "Planned date of arrival" +msgstr "Geplanter Ankunftstag" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:224 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:54 +msgid "Shirt size" +msgstr "T-Shirt Größe" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:229 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:337 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:98 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:375 +msgid "Password" +msgstr "Passwort" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:232 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:376 +msgid "Confirm password" +msgstr "Passwort wiederholen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:235 +msgid "What do you want to do?" +msgstr "Was möchtest Du machen?" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:235 +msgid "Description of job types" +msgstr "Beschreibung der Aufgaben" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:236 +======= #: includes/pages/guest_login.php:217 includes/pages/user_settings.php:181 msgid "Planned date of arrival" msgstr "Geplanter Ankunftstag" @@ -1286,6 +2237,7 @@ msgid "Description of job types" msgstr "Beschreibung der Aufgaben" #: includes/pages/guest_login.php:232 +>>>>>>> pr/276 msgid "" "Restricted angel types need will be confirmed later by an archangel. You can " "change your selection in the options section." @@ -1293,6 +2245,48 @@ msgstr "" "Beschränkte Engeltypen müssen später von einem Erzengel freigeschaltet " "werden. Du kannst Deine Auswahl später in den Einstellungen ändern." +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:244 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:48 +msgid "Mobile" +msgstr "Handy" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:247 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:46 +msgid "Phone" +msgstr "Telefon" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:253 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:42 +msgid "First name" +msgstr "Vorname" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:256 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:41 +msgid "Last name" +msgstr "Nachname" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:261 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:45 +msgid "Age" +msgstr "Alter" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:264 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:53 +msgid "Hometown" +msgstr "Wohnort" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:267 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:39 +msgid "Entry required!" +msgstr "Pflichtfeld!" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:305 +msgid "Please enter a password." +msgstr "Gib bitte ein Passwort ein." + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:309 +======= #: includes/pages/guest_login.php:240 includes/pages/user_settings.php:186 msgid "Mobile" msgstr "Handy" @@ -1326,6 +2320,7 @@ msgid "Please enter a password." msgstr "Gib bitte ein Passwort ein." #: includes/pages/guest_login.php:305 +>>>>>>> pr/276 msgid "" "No user was found with that Nickname. Please try again. If you are still " "having problems, ask an Dispatcher." @@ -1333,6 +2328,29 @@ msgstr "" "Es wurde kein Engel mit diesem Namen gefunden. Probiere es bitte noch " "einmal. Wenn das Problem weiterhin besteht, frage einen Dispatcher." +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:313 +msgid "Please enter a nickname." +msgstr "Gib bitte einen Nick an." + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:340 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:101 +msgid "I forgot my password" +msgstr "Passwort vergessen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:342 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:103 +msgid "Please note: You have to activate cookies!" +msgstr "Hinweis: Cookies müssen aktiviert sein!" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:348 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:107 +msgid "What can I do?" +msgstr "Was kann ich machen?" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:349 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:108 +======= #: includes/pages/guest_login.php:309 msgid "Please enter a nickname." msgstr "Gib bitte einen Nick an." @@ -1350,15 +2368,24 @@ msgid "What can I do?" msgstr "Was kann ich machen?" #: includes/pages/guest_login.php:348 includes/view/User_view.php:48 +>>>>>>> pr/276 msgid "Please read about the jobs you can do to help us." msgstr "" "Bitte informiere Dich über die Tätigkeiten bei denen Du uns helfen kannst." +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:364 +msgid "Please sign up, if you want to help us!" +msgstr "Bitte registriere Dich, wenn Du helfen möchtest!" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:371 +======= #: includes/pages/guest_login.php:363 msgid "Please sign up, if you want to help us!" msgstr "Bitte registriere Dich, wenn Du helfen möchtest!" #: includes/pages/guest_login.php:370 +>>>>>>> pr/276 msgid "Registration is disabled." msgstr "Registrierung ist abgeschaltet." @@ -1370,6 +2397,17 @@ msgstr "Nachrichten" msgid "Select recipient..." msgstr "Empfänger auswählen..." +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:62 +msgid "mark as read" +msgstr "als gelesen markieren" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:65 +msgid "delete message" +msgstr "Nachricht löschen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:72 +======= #: includes/pages/user_messages.php:51 includes/pages/user_messages.php:55 #: includes/pages/user_news.php:66 includes/pages/user_news.php:98 #: includes/pages/user_questions.php:17 @@ -1385,10 +2423,49 @@ msgid "delete message" msgstr "Nachricht löschen" #: includes/pages/user_messages.php:78 +>>>>>>> pr/276 #, php-format msgid "Hello %s, here can you leave messages for other angels" msgstr "Hallo %s, hier kannst Du anderen Engeln Nachrichten schreiben." +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:75 +msgid "New" +msgstr "Neu" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:77 +msgid "Transmitted" +msgstr "Gesendet" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:78 +msgid "Recipient" +msgstr "Empfänger" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:90 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:106 +msgid "Incomplete call, missing Message ID." +msgstr "Unvollständiger Aufruf, fehlende Nachrichten ID." + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:98 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:114 +msgid "No Message found." +msgstr "Keine Nachricht gefunden." + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:122 +msgid "Transmitting was terminated with an Error." +msgstr "Übertragung wurde mit einem Fehler abgebrochen." + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:127 +msgid "Wrong action." +msgstr "Falsche Aktion." + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:23 +msgid "Key changed." +msgstr "Key geändert." + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:26 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:335 +======= #: includes/pages/user_messages.php:81 msgid "New" msgstr "Neu" @@ -1426,6 +2503,7 @@ msgid "Key changed." msgstr "Key geändert." #: includes/pages/user_myshifts.php:26 includes/view/User_view.php:275 +>>>>>>> pr/276 msgid "Reset API key" msgstr "API-Key zurücksetzen" @@ -1450,11 +2528,19 @@ msgstr "Gib bitte einen Schwänz-Kommentar ein!" msgid "Shift saved." msgstr "Schicht gespeichert." +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:107 +msgid "Shift canceled." +msgstr "Schichteintrag gelöscht." + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:109 +======= #: includes/pages/user_myshifts.php:107 msgid "Shift canceled." msgstr "Schichteintrag gelöscht." #: includes/pages/user_myshifts.php:109 +>>>>>>> pr/276 msgid "" "It's too late to sign yourself off the shift. If neccessary, ask the " "dispatcher to do so." @@ -1474,6 +2560,26 @@ msgstr "News" msgid "Meetings" msgstr "Treffen" +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:68 +msgid "Comments" +msgstr "Kommentare" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:86 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:127 +msgid "Entry saved." +msgstr "Eintrag gespeichert." + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:104 +msgid "New Comment:" +msgstr "Neuer Kommentar:" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:110 +msgid "Invalid request." +msgstr "Ungültige Abfrage." + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:158 +======= #: includes/pages/user_news.php:71 msgid "Comments" msgstr "Kommentare" @@ -1491,6 +2597,7 @@ msgid "Invalid request." msgstr "Ungültige Abfrage." #: includes/pages/user_news.php:164 +>>>>>>> pr/276 msgid "Create news:" msgstr "News anlegen:" @@ -1498,6 +2605,70 @@ msgstr "News anlegen:" msgid "Ask an archangel" msgstr "Frage einen Erzengel" +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:27 +msgid "Unable to save question." +msgstr "Konnte Frage nicht speichern." + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:29 +msgid "You question was saved." +msgstr "Frage gespeichert." + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:33 +msgid "Please enter a question!" +msgstr "Gib eine Frage ein!" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:41 +msgid "Incomplete call, missing Question ID." +msgstr "Unvollständiger Aufruf, fehlende Fragen ID." + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:50 +msgid "No question found." +msgstr "Keine Frage gefunden." + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:4 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:332 +msgid "Settings" +msgstr "Einstellungen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:52 +msgid "" +"Please enter your planned date of arrival. It should be after the buildup " +"start date and before teardown end date." +msgstr "" +"Bitte gib Dein geplantes Ankunftsdatum an. Es sollte nach dem Aufbaubeginn " +"und vor dem Abbauende liegen." + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:62 +msgid "" +"Please enter your planned date of departure. It should be after your planned " +"arrival date and after buildup start date and before teardown end date." +msgstr "" +"Bitte gibt dein geplantes Abreisedatum an. Es sollte nach Deinem " +"Anreisedatum, nach dem Aufbaubeginn und vor dem Abbauende liegen." + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:90 +msgid "-> not OK. Please try again." +msgstr "-> Nicht OK. Bitte erneut versuchen." + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:98 +msgid "Failed setting password." +msgstr "Konnte Passwort nicht speichern." + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:123 +msgid "Theme changed." +msgstr "Aussehen geändert." + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:77 +msgid "The administration has not configured any rooms yet." +msgstr "Die Administratoren habe noch keine Räume eingerichtet." + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:89 +msgid "The administration has not configured any shifts yet." +msgstr "Die Administratoren haben noch keine Schichten angelegt." + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:99 +======= #: includes/pages/user_questions.php:30 msgid "Unable to save question." msgstr "Konnte Frage nicht speichern." @@ -1677,6 +2848,7 @@ msgid "free" msgstr "frei" #: includes/pages/user_shifts.php:397 +>>>>>>> pr/276 msgid "" "The administration has not configured any angeltypes yet - or you are not " "subscribed to any angeltype." @@ -1684,6 +2856,22 @@ msgstr "" "Die Administratoren haben noch keine Engeltypen konfiguriert - oder Du hast " "noch keine Engeltypen ausgewählt." +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:148 +msgid "occupied" +msgstr "belegt" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:152 +msgid "free" +msgstr "frei" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:172 +msgid "Occupancy" +msgstr "Belegung" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:173 +#, fuzzy +======= #: includes/pages/user_shifts.php:671 includes/pages/user_shifts.php:818 #, php-format msgid "%d helper needed" @@ -1722,13 +2910,24 @@ msgid "Occupancy" msgstr "Belegung" #: includes/pages/user_shifts.php:888 +>>>>>>> pr/276 msgid "" -"The tasks shown here are influenced by the preferences you defined in your " -"settings!" +"The tasks shown here are influenced by the angeltypes you joined already!" msgstr "" "Die Schichten, die hier angezeigt werden, sind von Deinen Einstellungen " "(Engeltypen/Aufgaben) abhängig!" +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:173 +msgid "Description of the jobs." +msgstr "Beschreibung der Aufgaben." + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:175 +msgid "iCal export" +msgstr "iCal Export" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:175 +======= #: includes/pages/user_shifts.php:888 msgid "Description of the jobs." msgstr "Beschreibung der Aufgaben." @@ -1742,6 +2941,7 @@ msgid "iCal export" msgstr "iCal Export" #: includes/pages/user_shifts.php:891 +>>>>>>> pr/276 #, php-format msgid "" "Export of shown shifts. <a href=\"%s\">iCal format</a> or <a href=\"%s" @@ -1752,6 +2952,30 @@ msgstr "" "\">JSON Format</a> verfügbar (Link bitte geheimhalten, sonst <a href=\"%s" "\">API-Key zurücksetzen</a>)." +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:176 +msgid "Filter" +msgstr "Filter" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:198 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:23 +msgid "All" +msgstr "Alle" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:199 +msgid "None" +msgstr "Keine" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:27 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:231 +msgid "Unconfirmed" +msgstr "Unbestätigt" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:29 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:33 +msgid "supporter" +msgstr "Supporter" +======= #: includes/pages/user_shifts.php:892 msgid "Filter" msgstr "Filter" @@ -1816,6 +3040,7 @@ msgstr "Unbestätigt" #: includes/view/AngelTypes_view.php:29 includes/view/AngelTypes_view.php:33 msgid "Coordinator" msgstr "Koordinator" +>>>>>>> pr/276 #: includes/view/AngelTypes_view.php:31 includes/view/AngelTypes_view.php:35 msgid "Member" @@ -1836,7 +3061,12 @@ msgstr "Möchtest Du den Engeltypen %s löschen?" msgid "cancel" msgstr "abbrechen" +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:58 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:256 +======= #: includes/view/AngelTypes_view.php:58 includes/view/AngelTypes_view.php:226 +>>>>>>> pr/276 msgid "Restricted" msgstr "Beschränkt" @@ -1852,8 +3082,15 @@ msgstr "" "Beschränkte Engeltypen müssen von einem Erzengel oder Team-Koordinator " "freigeschaltet werden (double-opt-in)." +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:61 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:192 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:118 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:37 +======= #: includes/view/AngelTypes_view.php:61 includes/view/AngelTypes_view.php:102 #: includes/view/ShiftTypes_view.php:37 includes/view/Shifts_view.php:120 +>>>>>>> pr/276 msgid "Description" msgstr "Beschreibung" @@ -1861,11 +3098,19 @@ msgstr "Beschreibung" msgid "Please use markdown for the description." msgstr "Bitte benutze Markdown für die Beschreibung." +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:77 +msgid "my driving license" +msgstr "Meine Führerschein-Infos" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:84 +======= #: includes/view/AngelTypes_view.php:74 msgid "my driving license" msgstr "Meine Führerschein-Infos" #: includes/view/AngelTypes_view.php:81 +>>>>>>> pr/276 msgid "" "This angeltype requires a driver license. Please enter your driver license " "information!" @@ -1873,7 +3118,11 @@ msgstr "" "Dieser Engeltyp benötigt Führerschein-Infos. Bitte trage Deine Führerschein-" "Infos ein!" +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:88 +======= #: includes/view/AngelTypes_view.php:85 +>>>>>>> pr/276 #, php-format msgid "" "You are unconfirmed for this angeltype. Please go to the introduction for %s " @@ -1882,6 +3131,92 @@ msgstr "" "Du bist noch nicht für diesen Engeltyp bestätigt. Bitte gehe zur Einführung " "für %s um bestätigt zu werden." +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:127 +msgid "confirm" +msgstr "bestätigen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:128 +msgid "deny" +msgstr "ablehnen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:144 +msgid "remove" +msgstr "entfernen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:166 +msgid "Driver" +msgstr "Fahrer" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:167 +msgid "Has car" +msgstr "Hat Auto" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:168 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:27 +msgid "Car" +msgstr "Auto" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:169 +msgid "3,5t Transporter" +msgstr "3,5t Transporter" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:170 +msgid "7,5t Truck" +msgstr "7,5t LKW" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:171 +msgid "12,5t Truck" +msgstr "12,5t LKW" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:172 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:31 +msgid "Forklift" +msgstr "Gabelstapler" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:202 +msgid "supporters" +msgstr "Supporter" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:222 +msgid "Members" +msgstr "Mitglieder" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:225 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:72 +msgid "Add" +msgstr "Hinzufügen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:233 +msgid "confirm all" +msgstr "Alle bestätigen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:234 +msgid "deny all" +msgstr "Alle ablehnen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:251 +msgid "New angeltype" +msgstr "Neuer Engeltyp" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:257 +msgid "Membership" +msgstr "Mitgliedschaft" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:282 +msgid "" +"This angeltype is restricted by double-opt-in by a team supporter. Please " +"show up at the according introduction meetings." +msgstr "" +"Dieser Engeltyp muss zusätzlich von einem Team-Supporter freigeschaltet " +"werden. Bitte komme zu den entsprechenden Einführungstreffen." + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:303 +msgid "FAQ" +msgstr "FAQ" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:305 +======= #: includes/view/AngelTypes_view.php:126 msgid "confirm" msgstr "bestätigen" @@ -1958,6 +3293,7 @@ msgid "FAQ" msgstr "FAQ" #: includes/view/AngelTypes_view.php:243 +>>>>>>> pr/276 msgid "" "Here is the list of teams and their tasks. If you have questions, read the " "FAQ." @@ -1965,6 +3301,9 @@ msgstr "" "Hier ist die Liste der Teams und ihrer Aufgaben. Wenn Du Fragen hast, schaue " "im FAQ nach." +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:9 +======= #: includes/view/AngelTypes_view.php:261 msgid "" "This angeltype is restricted by double-opt-in by a team coordinator. Please " @@ -1974,6 +3313,7 @@ msgstr "" "werden. Bitte komme zu den entsprechenden Einführungstreffen." #: includes/view/EventConfig_view.php:9 +>>>>>>> pr/276 msgid "We got no information about the event right now." msgstr "Wir haben aktuell keine Informationen über das Event." @@ -2060,6 +3400,94 @@ msgstr "Offene Fragen" msgid "Your Question:" msgstr "Deine Frage:" +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:192 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:342 +msgid "Time" +msgstr "Zeit" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:231 +msgid "Your shift" +msgstr "Meine Schicht" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:232 +msgid "Help needed" +msgstr "Hilfe benötigt" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:233 +msgid "Other angeltype needed / collides with my shifts" +msgstr "Andere Engeltypen benötigt / kollidiert mit meinen Schichten" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:234 +msgid "Shift is full" +msgstr "Schicht ist voll" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:235 +msgid "Shift running/ended" +msgstr "Schicht läuft/vorbei" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:82 +msgid "Add more angels" +msgstr "Neue Engel hinzufügen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:113 +#, php-format +msgid "%d helper needed" +msgid_plural "%d helpers needed" +msgstr[0] "%d Helfer benötigt" +msgstr[1] "%d Helfer benötigt" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:118 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:23 +msgid "Sign up" +msgstr "Eintragen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:123 +msgid "ended" +msgstr "vorbei" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:132 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:25 +#, php-format +msgid "Become %s" +msgstr "Werde ein %s" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:18 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:263 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:265 +msgid "Freeloaded" +msgstr "Geschwänzt" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:19 +msgid "Freeload comment (Only for shift coordination):" +msgstr "Schwänzer Kommentar (Nur für die Schicht-Koordination):" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:22 +msgid "Edit shift entry" +msgstr "Schichteintrag bearbeiten" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:25 +msgid "Angel:" +msgstr "Engel:" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:26 +msgid "Date, Duration:" +msgstr "Termin, Dauer:" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:27 +msgid "Location:" +msgstr "Ort:" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:28 +msgid "Title:" +msgstr "Titel:" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:29 +msgid "Type:" +msgstr "Typ:" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:30 +======= #: includes/view/ShiftEntry_view.php:18 includes/view/User_view.php:203 #: includes/view/User_view.php:205 msgid "Freeloaded" @@ -2094,6 +3522,7 @@ msgid "Type:" msgstr "Typ:" #: includes/view/ShiftEntry_view.php:30 +>>>>>>> pr/276 msgid "Comment (for your eyes only):" msgstr "Kommentar (nur für Dich):" @@ -2129,6 +3558,18 @@ msgstr "erstellt am %s von %s" msgid "edited at %s by %s" msgstr "bearbeitet am %s von %s" +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:78 +msgid "This shift collides with one of your shifts." +msgstr "Diese Schicht kollidiert mit deinen Schichten." + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:79 +msgid "You are signed up for this shift." +msgstr "Du bist für diese Schicht eingetragen." + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:108 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:343 +======= #: includes/view/Shifts_view.php:80 msgid "This shift collides with one of your shifts." msgstr "Diese Schicht kollidiert mit deinen Schichten." @@ -2138,6 +3579,7 @@ msgid "You are signed up for this shift." msgstr "Du bist für diese Schicht eingetragen." #: includes/view/Shifts_view.php:110 includes/view/User_view.php:283 +>>>>>>> pr/276 msgid "Location" msgstr "Ort" @@ -2230,11 +3672,63 @@ msgstr "12,5t LKW" msgid "Please select..." msgstr "Bitte auswählen..." +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:38 +msgid "Here you can change your user details." +msgstr "Hier kannst Du Deine Details ändern." + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:44 +msgid "Planned date of departure" +msgstr "Geplanter Abreisetag" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:55 +msgid "Please visit the angeltypes page to manage your angeltypes." +msgstr "Bitte benutze die Engeltypen-Seite um deine Engeltypen zu verwalten." + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:61 +msgid "Here you can change your password." +msgstr "Hier kannst Du Dein Passwort ändern." + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:62 +msgid "Old password:" +msgstr "Altes Passwort:" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:63 +msgid "New password:" +msgstr "Neues Passwort:" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:64 +msgid "Password confirmation:" +msgstr "Passwort wiederholen:" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:68 +msgid "Here you can choose your color settings:" +msgstr "Hier kannst Du das Aussehen auswählen:" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:69 +msgid "Color settings:" +msgstr "Aussehen:" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:73 +msgid "Here you can choose your language:" +msgstr "Hier kannst Du Deine Sprache auswählen:" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:74 +msgid "Language:" +msgstr "Sprache:" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:88 +msgid "Registration successful" +msgstr "Registrierung erfolgreich" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:126 +======= #: includes/view/User_view.php:28 msgid "Registration successful" msgstr "Registrierung erfolgreich" #: includes/view/User_view.php:66 +>>>>>>> pr/276 msgid "" "Do you really want to delete the user including all his shifts and every " "other piece of his data?" @@ -2242,15 +3736,74 @@ msgstr "" "Möchtest Du wirklich den Engel inklusive aller seiner Schichten und allen " "anderen seiner Daten löschen?" +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:128 +msgid "Your password" +msgstr "Dein Passwort" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:143 +======= #: includes/view/User_view.php:68 msgid "Your password" msgstr "Dein Passwort" #: includes/view/User_view.php:83 +>>>>>>> pr/276 #, php-format msgid "Angel should receive at least %d vouchers." msgstr "Engel sollte mindestens %d Voucher bekommen." +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:145 +msgid "Number of vouchers given out" +msgstr "Anzahl Voucher bekommen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:159 +msgid "m/d/Y h:i a" +msgstr "d.m.Y H:i" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:178 +msgid "New user" +msgstr "Neuer User" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:182 +msgid "Prename" +msgstr "Vorname" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:185 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:311 +msgid "Arrived" +msgstr "Angekommen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:186 +msgid "Voucher" +msgstr "Voucher" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:187 +msgid "Freeloads" +msgstr "Schwänzereien" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:188 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:313 +msgid "Active" +msgstr "Aktiv" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:190 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:314 +msgid "T-Shirt" +msgstr "T-Shirt" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:192 +msgid "Last login" +msgstr "Letzter Login" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:209 +msgid "Free" +msgstr "Frei" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:214 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:216 +======= #: includes/view/User_view.php:85 msgid "Number of vouchers given out" msgstr "Anzahl Voucher bekommen" @@ -2296,20 +3849,44 @@ msgid "Free" msgstr "Frei" #: includes/view/User_view.php:154 includes/view/User_view.php:156 +>>>>>>> pr/276 #, php-format msgid "Next shift %c" msgstr "Nächste Schicht %c" +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:221 +======= #: includes/view/User_view.php:161 +>>>>>>> pr/276 #, php-format msgid "Shift starts %c" msgstr "Schicht startet %c" +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:223 +======= #: includes/view/User_view.php:163 +>>>>>>> pr/276 #, php-format msgid "Shift ends %c" msgstr "Schicht endet %c" +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:276 +msgid "sign off" +msgstr "abmelden" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:289 +msgid "Sum:" +msgstr "Summe:" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:308 +msgid "User state" +msgstr "Engelzustand" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:311 +======= #: includes/view/User_view.php:216 msgid "sign off" msgstr "abmelden" @@ -2323,26 +3900,82 @@ msgid "User state" msgstr "Engelzustand" #: includes/view/User_view.php:251 +>>>>>>> pr/276 #, php-format msgid "Arrived at %s" msgstr "Angekommen am %s" +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:311 +======= #: includes/view/User_view.php:251 +>>>>>>> pr/276 #, php-format msgid "Not arrived (Planned: %s)" msgstr "Nicht angekommen (Geplant: %s)" +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:311 +msgid "Not arrived" +msgstr "Nicht angekommen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:312 +======= #: includes/view/User_view.php:251 msgid "Not arrived" msgstr "Nicht angekommen" #: includes/view/User_view.php:252 +>>>>>>> pr/276 #, php-format msgid "Got %s voucher" msgid_plural "Got %s vouchers" msgstr[0] "Einen Voucher bekommen" msgstr[1] "%s Voucher bekommen" +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:312 +msgid "Got no vouchers" +msgstr "Voucher nicht bekommen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:321 +msgid "Rights" +msgstr "Rechte" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:329 +msgid "driving license" +msgstr "Führerschein" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:331 +msgid "Edit vouchers" +msgstr "Voucher bearbeiten" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:333 +msgid "iCal Export" +msgstr "iCal Export" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:334 +msgid "JSON Export" +msgstr "JSON Export" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:344 +msgid "Name & workmates" +msgstr "Name & Kollegen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:345 +msgid "Comment" +msgstr "Kommentar" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:346 +msgid "Action" +msgstr "Aktion" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:348 +msgid "Your night shifts between 2 and 8 am count twice." +msgstr "Deine Nachtschichten zwischen 2 und 8 Uhr zählen doppelt." + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:349 +======= #: includes/view/User_view.php:252 msgid "Got no vouchers" msgstr "Voucher nicht bekommen" @@ -2384,6 +4017,7 @@ msgid "Your night shifts between 2 and 8 am count twice." msgstr "Deine Nachtschichten zwischen 2 und 8 Uhr zählen doppelt." #: includes/view/User_view.php:289 +>>>>>>> pr/276 #, php-format msgid "" "Go to the <a href=\"%s\">shifts table</a> to sign yourself up for some " @@ -2392,7 +4026,11 @@ msgstr "" "Gehe zur <a href=\"%s\">Schicht-Tabelle</a>, um Dich für Schichten " "einzutragen." +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:359 +======= #: includes/view/User_view.php:299 +>>>>>>> pr/276 msgid "" "We will send you an e-mail with a password recovery link. Please use the " "email address you used for registration." @@ -2401,6 +4039,105 @@ msgstr "" "zurücksetzen kannst. Bitte benutze die Mailadresse, die du bei der Anmeldung " "verwendet hast." +<<<<<<< HEAD +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:362 +msgid "Recover" +msgstr "Wiederherstellen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:373 +msgid "Please enter a new password." +msgstr "Gib bitte ein neues Passwort ein." + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:6 +#, php-format +msgid "Do you really want to add supporter rights for %s to %s?" +msgstr "Sollen %s %s als neuen Supporter bekommen?" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:6 +#, php-format +msgid "Do you really want to remove supporter rights for %s from %s?" +msgstr "Möchtest Du wirklich %s von %s als Supporter befreien?" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:17 +#, php-format +msgid "Do you really want to deny all users for %s?" +msgstr "Möchtest Du wirklich alle Benutzer als %s ablehnen?" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:28 +#, php-format +msgid "Do you really want to confirm all users for %s?" +msgstr "Möchtest Du wirklich alle Benutzer als %s bestätigen?" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:39 +#, php-format +msgid "Do you really want to confirm %s for %s?" +msgstr "Möchtest Du wirklich %s für %s bestätigen?" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:50 +#, php-format +msgid "Do you really want to delete %s from %s?" +msgstr "Möchtest Du wirklich %s von %s entfernen?" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:71 +msgid "User" +msgstr "Benutzer" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:80 +#, php-format +msgid "Do you really want to add %s to %s?" +msgstr "Möchtest Du wirklich %s zu %s hinzufügen?" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:83 +msgid "save" +msgstr "Speichern" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:17 +msgid "Back to profile" +msgstr "Zurück zum Profil" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:21 +msgid "Privacy" +msgstr "Privatsphäre" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:21 +msgid "" +"Your driving license information is only visible for supporters and admins." +msgstr "Deine Führerschein-Infos sind nur für Supporter und Admins sichtbar." + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:22 +msgid "I am willing to operate cars for the PL" +msgstr "Ich möchte für die PL Auto fahren" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:25 +msgid "" +"I have my own car with me and am willing to use it for the PL (You'll get " +"reimbursed for fuel)" +msgstr "" +"Ich habe mein eigenes Auto dabei und möchte würde es zum Fahren für die PL " +"verwenden (Du wirst für Spritkosten entschädigt)" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:26 +msgid "Driver license" +msgstr "Führerschein" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:28 +msgid "Transporter 3,5t" +msgstr "3,5t Transporter" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:29 +msgid "Truck 7,5t" +msgstr "7,5t LKW" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:30 +msgid "Truck 12,5t" +msgstr "12,5t LKW" + +#: /Users/msquare/workspace/projects/engelsystem/public/index.php:155 +msgid "No Access" +msgstr "Kein Zugriff" + +#: /Users/msquare/workspace/projects/engelsystem/public/index.php:156 +======= #: includes/view/User_view.php:302 msgid "Recover" msgstr "Wiederherstellen" @@ -2414,6 +4151,7 @@ msgid "No Access" msgstr "Kein Zugriff" #: public/index.php:153 +>>>>>>> pr/276 msgid "" "You don't have permission to view this page. You probably have to sign in or " "register in order to gain access!" @@ -2421,6 +4159,28 @@ msgstr "" "Du hast keinen Zugriff auf diese Seite. Registriere Dich und logge Dich " "bitte ein, um Zugriff zu erhalten!" +<<<<<<< HEAD +#~ msgid "Please enter your planned date of departure." +#~ msgstr "Bitte gib Dein geplantes Abreisedatum an." + +#~ msgid "Please select a user." +#~ msgstr "Bitte einen Benutzer auswählen." + +#~ msgid "Unable to load user." +#~ msgstr "Konnte Benutzer nicht laden." + +#~ msgid "Entries" +#~ msgstr "Einträge" + +#~ msgid "Use new style if possible" +#~ msgstr "Wenn möglich neuen Stil verwenden" + +#~ msgid "Coordinator" +#~ msgstr "Koordinator" + +#~ msgid "Coordinators" +#~ msgstr "Koordinatoren" +======= #~ msgid "Please select a user." #~ msgstr "Bitte einen Benutzer auswählen." @@ -2430,6 +4190,7 @@ msgstr "" #~ msgstr "" #~ "Mit diesem Formular registrierst Du Dich als Engel. Du bekommst ein Konto " #~ "in der Engel-Aufgabenverwaltung." +>>>>>>> pr/276 #~ msgid " vouchers." #~ msgstr " Vouchers." |