diff options
| author | msquare <msquare@notrademark.de> | 2016-11-15 15:49:39 +0100 |
|---|---|---|
| committer | msquare <msquare@notrademark.de> | 2016-11-15 15:49:39 +0100 |
| commit | 19d5d68d82232d1047787737795a21bd79f9be95 (patch) | |
| tree | 84edf74824be8369cf16b32e1a89770006a595b4 /locale | |
| parent | 3873b8dc6113aa465159ff62ffd59dc22479fa3c (diff) | |
fix fucked up merge
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/de_DE.UTF-8/LC_MESSAGES/default.mo | bin | 40976 -> 41173 bytes | |||
| -rw-r--r-- | locale/de_DE.UTF-8/LC_MESSAGES/default.po | 2108 |
2 files changed, 271 insertions, 1837 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 07cf1c15..8c497cc7 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 e17c9f34..d7d24c87 100644 --- a/locale/de_DE.UTF-8/LC_MESSAGES/default.po +++ b/locale/de_DE.UTF-8/LC_MESSAGES/default.po @@ -1,13 +1,8 @@ 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 +"POT-Creation-Date: 2016-11-15 15:48+0100\n" +"PO-Revision-Date: 2016-11-15 15:48+0100\n" "Last-Translator: msquare <msquare@notrademark.de>\n" "Language-Team: \n" "Language: de_DE\n" @@ -16,68 +11,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 1.8.11\n" "X-Poedit-KeywordsList: _;gettext;gettext_noop\n" -"X-Poedit-Basepath: ../../..\n" +"X-Poedit-Basepath: .\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Poedit-SourceCharset: UTF-8\n" -"X-Poedit-SearchPath-0: locale/de_DE.UTF-8/LC_MESSAGES\n" +"X-Poedit-SearchPath-0: /Users/msquare/workspace/projects/engelsystem\n" "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 @@ -96,67 +34,32 @@ 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 -msgid "Angeltypes" -msgstr "Engeltypen" - -#: includes/controller/angeltypes_controller.php:58 -#: includes/pages/guest_login.php:350 includes/view/AngelTypes_view.php:222 -#: includes/view/AngelTypes_view.php:269 includes/view/User_view.php:50 -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" @@ -167,9 +70,9 @@ msgstr "ansehen" #: /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/Shifts_view.php:81 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:273 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:328 msgid "edit" @@ -185,10 +88,10 @@ msgstr "bearbeiten" #: /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 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:82 msgid "delete" msgstr "löschen" @@ -367,13 +270,13 @@ msgstr "Benötigte Engel" #: /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/UserDriverLicenses_view.php:34 #: /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" @@ -387,111 +290,20 @@ 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" -msgstr "ansehen" - -#: includes/controller/angeltypes_controller.php:248 -#: includes/pages/admin_free.php:71 includes/pages/admin_groups.php:23 -#: includes/pages/admin_rooms.php:16 includes/view/AngelTypes_view.php:91 -#: includes/view/ShiftTypes_view.php:55 includes/view/ShiftTypes_view.php:66 -#: includes/view/Shifts_view.php:83 includes/view/User_view.php:213 -#: includes/view/User_view.php:268 -msgid "edit" -msgstr "bearbeiten" - -#: includes/controller/angeltypes_controller.php:249 -#: includes/pages/admin_questions.php:40 includes/pages/admin_questions.php:61 -#: includes/pages/admin_rooms.php:17 includes/pages/admin_user.php:122 -#: includes/pages/user_shifts.php:234 includes/view/AngelTypes_view.php:45 -#: includes/view/AngelTypes_view.php:94 includes/view/Questions_view.php:5 -#: includes/view/Questions_view.php:12 includes/view/ShiftTypes_view.php:16 -#: includes/view/ShiftTypes_view.php:56 includes/view/ShiftTypes_view.php:67 -#: includes/view/Shifts_view.php:84 -msgid "delete" -msgstr "löschen" - -#: includes/controller/angeltypes_controller.php:254 -#: includes/view/AngelTypes_view.php:87 includes/view/AngelTypes_view.php:253 -msgid "leave" -msgstr "verlassen" - -#: includes/controller/angeltypes_controller.php:256 -#: includes/view/AngelTypes_view.php:78 includes/view/AngelTypes_view.php:255 -msgid "join" -msgstr "mitmachen" - -#: includes/controller/angeltypes_controller.php:284 -#: includes/controller/user_angeltypes_controller.php:32 -#: includes/controller/user_angeltypes_controller.php:41 -#: includes/controller/user_angeltypes_controller.php:74 -#: includes/controller/user_angeltypes_controller.php:83 -#: includes/controller/user_angeltypes_controller.php:143 -#: includes/controller/user_angeltypes_controller.php:203 -#: includes/controller/user_angeltypes_controller.php:277 -msgid "Angeltype doesn't exist." -msgstr "Engeltyp existiert nicht." - -#: includes/controller/event_config_controller.php:4 -msgid "Event config" -msgstr "Event Einstellungen" - -#: includes/controller/event_config_controller.php:51 -msgid "Please enter buildup start date." -msgstr "Bitte gib das Aufbau Start Datum an." - -#: includes/controller/event_config_controller.php:55 -msgid "Please enter event start date." -msgstr "Bitte gib das Event Start Datum an." - -#: includes/controller/event_config_controller.php:59 -msgid "Please enter event end date." -msgstr "Bitte gib das Event Ende Datum an." - -#: includes/controller/event_config_controller.php:63 -msgid "Please enter teardown end date." -msgstr "Bitte gib das Abbau Ende Datum an." - -#: includes/controller/event_config_controller.php:69 -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." - -#: includes/controller/event_config_controller.php:74 -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." - -#: includes/controller/event_config_controller.php:79 -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." - -#: includes/controller/event_config_controller.php:84 -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." - -#: includes/controller/event_config_controller.php:95 -#: includes/pages/user_settings.php:119 -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." -#: includes/controller/shifttypes_controller.php:31 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:31 #, php-format msgid "Shifttype %s deleted." msgstr "Schichttyp %s gelöscht." -#: includes/controller/shifttypes_controller.php:36 -#: includes/view/ShiftTypes_view.php:12 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:36 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:12 #, php-format 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." @@ -514,37 +326,12 @@ 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." - -#: includes/controller/shifttypes_controller.php:77 -#: includes/pages/admin_rooms.php:67 -msgid "Please enter a name." -msgstr "Gib bitte einen Namen an." - -#: includes/controller/shifttypes_controller.php:97 -msgid "Updated shifttype." -msgstr "Schichttyp geändert." - -#: includes/controller/shifttypes_controller.php:104 -msgid "Created shifttype." -msgstr "Schichttyp erstellt." - -#: includes/controller/shifttypes_controller.php:161 -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:" @@ -554,22 +341,10 @@ 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:" - -#: includes/controller/user_angeltypes_controller.php:46 -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" @@ -590,33 +365,10 @@ 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" -msgstr "Alle Benutzer ablehnen" - -#: includes/controller/user_angeltypes_controller.php:92 -#: includes/controller/user_angeltypes_controller.php:125 -#: includes/controller/user_angeltypes_controller.php:134 -#: includes/controller/user_angeltypes_controller.php:185 -#: includes/controller/user_angeltypes_controller.php:194 -#: includes/controller/user_angeltypes_controller.php:252 -#: includes/controller/user_angeltypes_controller.php:268 -msgid "User angeltype doesn't exist." -msgstr "Benutzer-Engeltype existiert nicht." - -#: includes/controller/user_angeltypes_controller.php:97 -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" @@ -634,30 +386,10 @@ 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" -msgstr "Alle Benutzer bestätigen" - -#: includes/controller/user_angeltypes_controller.php:148 -msgid "You are not allowed to confirm this users angeltype." -msgstr "Du darfst diesen Benutzer nicht für diesen Engeltyp freischalten." - -#: includes/controller/user_angeltypes_controller.php:157 -#: includes/controller/user_angeltypes_controller.php:212 -#: includes/controller/user_angeltypes_controller.php:286 -#: includes/controller/users_controller.php:316 -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" @@ -668,23 +400,10 @@ 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" -msgstr "Engeltyp für Benutzer bestätigen" - -#: includes/controller/user_angeltypes_controller.php:217 -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" @@ -699,36 +418,15 @@ 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" -msgstr "Engeltyp löschen" - -#: includes/controller/user_angeltypes_controller.php:247 -msgid "You are not allowed to set coordinator rights." -msgstr "Du darfst keine Koordinatorrechte bearbeiten." - -#: includes/controller/user_angeltypes_controller.php:259 -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 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 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 @@ -742,69 +440,32 @@ 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 -msgid "Add coordinator rights" -msgstr "Koordinatorrechte geben" - -#: includes/controller/user_angeltypes_controller.php:304 -#: includes/view/AngelTypes_view.php:133 -#: includes/view/UserAngelTypes_view.php:4 -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 " @@ -813,7 +474,6 @@ 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" @@ -832,77 +492,43 @@ 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" - -#: includes/controller/user_driver_licenses_controller.php:123 -msgid "Please select at least one driving license." -msgstr "Bitte wähle mindestens einen Führerschein-Typen aus." - -#: includes/controller/user_driver_licenses_controller.php:133 -msgid "Your driver license information has been removed." -msgstr "Deine Führerschein-Infos wurden gelöscht." - -#: includes/controller/user_driver_licenses_controller.php:147 -msgid "Your driver license information has been saved." -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" -#: includes/controller/users_controller.php:50 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:50 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." -#: includes/controller/users_controller.php:69 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:69 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" -#: includes/controller/users_controller.php:118 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:118 msgid "Please enter a valid number of vouchers." msgstr "Bitte gib eine korrekte Anzahl von Vouchern ein." -#: includes/controller/users_controller.php:129 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:129 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." @@ -918,12 +544,12 @@ 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 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:96 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 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:94 msgid "Your password is to short (please use at least 6 characters)." msgstr "Dein Passwort ist zu kurz (Bitte mindestens 6 Zeichen nutzen)." @@ -932,7 +558,7 @@ 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 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:98 msgid "Password saved." msgstr "Passwort gespeichert." @@ -955,79 +581,25 @@ 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." - -#: includes/controller/users_controller.php:207 includes/view/User_view.php:115 -msgid "All users" -msgstr "Alle Benutzer" - -#: includes/controller/users_controller.php:223 -msgid "Token is not correct." -msgstr "Der Token ist nicht in Ordnung." - -#: includes/controller/users_controller.php:233 -#: includes/pages/guest_login.php:100 includes/pages/user_settings.php:130 -msgid "Your passwords don't match." -msgstr "Deine Passwörter stimmen nicht überein." - -#: includes/controller/users_controller.php:237 -#: includes/pages/user_settings.php:128 -msgid "Your password is to short (please use at least 6 characters)." -msgstr "Dein Passwort ist zu kurz (Bitte mindestens 6 Zeichen nutzen)." - -#: includes/controller/users_controller.php:243 -msgid "Password could not be updated." -msgstr "Passwort kann nicht neu gesetzt werden." - -#: includes/controller/users_controller.php:246 -#: includes/pages/user_settings.php:132 -msgid "Password saved." -msgstr "Passwort gespeichert." - -#: includes/controller/users_controller.php:265 -#: includes/controller/users_controller.php:269 -#: includes/pages/guest_login.php:69 includes/pages/user_settings.php:36 -msgid "E-mail address is not correct." -msgstr "Die E-Mail Adresse ist nicht in Ordnung." - -#: includes/controller/users_controller.php:273 -#: includes/pages/guest_login.php:73 includes/pages/user_settings.php:40 -msgid "Please enter your e-mail." -msgstr "Bitte gib Deine E-Mail-Adresse ein." - -#: includes/controller/users_controller.php:281 -#: includes/controller/users_controller.php:299 -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." -#: includes/helper/email_helper.php:12 +#: /Users/msquare/workspace/projects/engelsystem/includes/helper/email_helper.php:12 #, php-format msgid "Hi %s," msgstr "Hallo %s," -#: includes/helper/email_helper.php:12 +#: /Users/msquare/workspace/projects/engelsystem/includes/helper/email_helper.php:12 msgid "here is a message for you from the engelsystem:" msgstr "hier ist eine Nachricht aus dem Engelsystem für Dich:" -#: includes/helper/email_helper.php:12 +#: /Users/msquare/workspace/projects/engelsystem/includes/helper/email_helper.php:12 msgid "" "This email is autogenerated and has not to be signed. You got this email " "because you are registered in the engelsystem." @@ -1036,72 +608,72 @@ msgstr "" "werden. Du hast diese E-Mail bekommen, weil Du im Engelsystem registriert " "bist." -#: includes/mailer/shifts_mailer.php:10 +#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:10 msgid "A Shift you are registered on has changed:" msgstr "Eine deiner Schichten hat sich geändert:" -#: includes/mailer/shifts_mailer.php:14 +#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:14 #, php-format msgid "* Shift type changed from %s to %s" msgstr "* Schichttyp von %s in %s geändert" -#: includes/mailer/shifts_mailer.php:19 +#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:19 #, php-format msgid "* Shift title changed from %s to %s" msgstr "* Schicht Titel von %s nach %s geändert" -#: includes/mailer/shifts_mailer.php:24 +#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:24 #, php-format msgid "* Shift Start changed from %s to %s" msgstr "* Schicht Beginn von %s nach %s geändert" -#: includes/mailer/shifts_mailer.php:29 +#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:29 #, php-format msgid "* Shift End changed from %s to %s" msgstr "* Schicht Ende von %s nach %s geändert" -#: includes/mailer/shifts_mailer.php:34 +#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:34 #, php-format msgid "* Shift Location changed from %s to %s" msgstr "* Schicht Ort von %s to %s geändert" -#: includes/mailer/shifts_mailer.php:44 +#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:44 msgid "The updated Shift:" msgstr "Die aktualisierte Schicht:" -#: includes/mailer/shifts_mailer.php:53 +#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:53 msgid "Your Shift has changed" msgstr "Deine Schicht hat sich geändert" -#: includes/mailer/shifts_mailer.php:62 +#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:62 msgid "A Shift you are registered on was deleted:" msgstr "Eine deiner Schichten wurde gelöscht:" -#: includes/mailer/shifts_mailer.php:71 +#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:71 msgid "Your Shift was deleted" msgstr "Deine Schicht wurde gelöscht" -#: includes/mailer/shifts_mailer.php:80 +#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:80 msgid "You have been assigned to a Shift:" msgstr "Du wurdest in eine Schicht eingetragen:" -#: includes/mailer/shifts_mailer.php:86 +#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:86 msgid "Assigned to Shift" msgstr "In Schicht eingetragen" -#: includes/mailer/shifts_mailer.php:94 +#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:94 msgid "You have been removed from a Shift:" msgstr "Du wurdest aus einer Schicht ausgetragen:" -#: includes/mailer/shifts_mailer.php:100 +#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:100 msgid "Removed from Shift" msgstr "Von Schicht ausgetragen" -#: includes/mailer/users_mailer.php:7 +#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/users_mailer.php:7 msgid "Your account has been deleted" msgstr "Dein Konto wurde gelöscht." -#: includes/mailer/users_mailer.php:7 +#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/users_mailer.php:7 msgid "" "Your angelsystem account has been deleted. If you have any questions " "regarding your account deletion, please contact heaven." @@ -1109,11 +681,11 @@ msgstr "" "Dein Engelsystem-Konto wurde gelöscht. Wenn Du dazu Fragen hast, kontaktiere " "bitte den Himmel." -#: includes/pages/admin_active.php:4 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:4 msgid "Active angels" msgstr "Aktive Engel" -#: includes/pages/admin_active.php:29 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:29 #, php-format msgid "" "At least %s angels are forced to be active. The number has to be greater." @@ -1121,75 +693,69 @@ msgstr "" "Mindestens %s engel werden als aktiv gekennzeichnet. Die Nummer muss größer " "sein." -#: includes/pages/admin_active.php:34 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:34 msgid "Please enter a number of angels to be marked as active." msgstr "" "Bitte gib eine Anzahl an Engeln ein, die als Aktiv markiert werden sollen." -#: includes/pages/admin_active.php:59 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:59 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/UserAngelTypes_view.php:67 #: /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" -#: includes/pages/admin_active.php:61 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:61 msgid "apply" msgstr "anwenden" -#: includes/pages/admin_active.php:71 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:71 msgid "Angel has been marked as active." msgstr "Engel wurde als aktiv markiert." -#: includes/pages/admin_active.php:73 includes/pages/admin_active.php:83 -#: includes/pages/admin_active.php:103 includes/pages/admin_arrive.php:23 -#: includes/pages/admin_arrive.php:34 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:73 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:83 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:103 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:23 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:34 msgid "Angel not found." msgstr "Engel nicht gefunden." -#: includes/pages/admin_active.php:81 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:81 msgid "Angel has been marked as not active." msgstr "Engel wurde als nicht aktiv markiert." -#: includes/pages/admin_active.php:91 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:91 msgid "Angel has got a t-shirt." msgstr "Engel hat ein T-Shirt bekommen." -#: includes/pages/admin_active.php:101 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:101 msgid "Angel has got no t-shirt." msgstr "Engel hat kein T-Shirt bekommen." -#: includes/pages/admin_active.php:144 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:144 msgid "set active" msgstr "setze aktiv" -#: includes/pages/admin_active.php:147 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:147 msgid "remove active" msgstr "entferne aktiv" -#: includes/pages/admin_active.php:148 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:148 msgid "got t-shirt" msgstr "hat t-shirt" -#: includes/pages/admin_active.php:151 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:151 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 @@ -1197,24 +763,17 @@ msgstr "entferne t-shirt" #: /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" -#: includes/pages/admin_active.php:177 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:177 msgid "Search angel:" msgstr "Suche Engel:" -#: includes/pages/admin_active.php:178 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:178 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 @@ -1222,29 +781,24 @@ msgstr "Alle Schichten anzeigen" #: /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" -#: includes/pages/admin_active.php:182 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:182 msgid "How much angels should be active?" msgstr "Wie viele Engel sollten aktiv sein?" -#: includes/pages/admin_active.php:183 includes/pages/admin_shifts.php:254 -#: includes/pages/admin_shifts.php:342 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:183 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:254 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:342 msgid "Preview" msgstr "Vorschau" -#: includes/pages/admin_active.php:187 includes/pages/admin_arrive.php:145 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:187 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:145 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 @@ -1254,155 +808,134 @@ 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" -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" -#: includes/pages/admin_active.php:190 includes/pages/admin_shifts.php:329 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:190 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:329 msgid "Length" msgstr "Länge" -#: includes/pages/admin_active.php:191 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:191 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" -#: includes/pages/admin_active.php:193 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:193 msgid "T-shirt?" msgstr "T-Shirt?" -#: includes/pages/admin_active.php:196 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:196 msgid "Shirt statistics" msgstr "T-Shirt Statistik" -#: includes/pages/admin_active.php:199 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:199 msgid "Needed shirts" msgstr "Benötigte T-Shirts" -#: includes/pages/admin_active.php:200 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:200 msgid "Given shirts" msgstr "Ausgegebene T-Shirts" -#: includes/pages/admin_arrive.php:4 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:4 msgid "Arrived angels" msgstr "Angekommene Engel" -#: includes/pages/admin_arrive.php:20 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:20 msgid "Reset done. Angel has not arrived." msgstr "Zurückgesetzt. Engel ist nicht angekommen." -#: includes/pages/admin_arrive.php:31 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:31 msgid "Angel has been marked as arrived." msgstr "Engel wurde als angekommen markiert." -#: includes/pages/admin_arrive.php:71 includes/view/UserAngelTypes_view.php:9 -#: includes/view/UserAngelTypes_view.php:20 -#: includes/view/UserAngelTypes_view.php:31 -#: includes/view/UserAngelTypes_view.php:42 -#: includes/view/UserAngelTypes_view.php:53 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:71 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:9 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:20 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:31 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:42 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:53 msgid "yes" msgstr "Ja" -#: includes/pages/admin_arrive.php:72 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:72 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" -#: includes/pages/admin_arrive.php:146 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:146 msgid "Planned arrival" msgstr "Geplanter Ankunftstag" -#: includes/pages/admin_arrive.php:147 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:147 msgid "Arrived?" msgstr "Angekommen?" -#: includes/pages/admin_arrive.php:148 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:148 msgid "Arrival date" msgstr "Ankunftsdatum" -#: includes/pages/admin_arrive.php:149 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:149 msgid "Planned departure" msgstr "Geplante Abreise" -#: includes/pages/admin_arrive.php:154 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:154 msgid "Planned arrival statistics" msgstr "Geplante Ankunfts-Statistik" -#: includes/pages/admin_arrive.php:157 includes/pages/admin_arrive.php:172 -#: includes/pages/admin_arrive.php:187 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:157 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:172 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:187 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" -#: includes/pages/admin_arrive.php:164 includes/pages/admin_arrive.php:179 -#: includes/pages/admin_arrive.php:194 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:164 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:179 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:194 msgid "Count" msgstr "Anzahl" -#: includes/pages/admin_arrive.php:169 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:169 msgid "Arrival statistics" msgstr "Ankunfts-Statistik" -#: includes/pages/admin_arrive.php:184 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:184 msgid "Planned departure statistics" msgstr "Geplante Abreise-Statistik" -#: includes/pages/admin_free.php:4 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:4 msgid "Free angels" msgstr "Freie Engel" -#: includes/pages/admin_free.php:81 includes/view/ShiftTypes_view.php:36 -#: includes/view/UserAngelTypes_view.php:70 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:81 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:36 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:70 msgid "Angeltype" msgstr "Engeltyp" -#: includes/pages/admin_free.php:84 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:84 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 @@ -1433,36 +966,13 @@ msgstr "Jabber" #: /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 -#: includes/view/User_view.php:37 includes/view/User_view.php:121 -msgid "Nick" -msgstr "Nick" - -#: includes/pages/admin_free.php:94 includes/pages/guest_login.php:237 -#: includes/pages/user_settings.php:185 includes/view/AngelTypes_view.php:152 -#: includes/view/AngelTypes_view.php:159 includes/view/User_view.php:124 -msgid "DECT" -msgstr "DECT" - -#: includes/pages/admin_free.php:95 includes/pages/guest_login.php:246 -#: includes/pages/user_settings.php:189 -msgid "Jabber" -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" -#: includes/pages/admin_groups.php:4 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:4 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 @@ -1473,21 +983,13 @@ msgstr "Gruppenrechte" #: /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" -#: includes/pages/admin_groups.php:30 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:30 msgid "Privileges" msgstr "Privilegien" -<<<<<<< HEAD #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:55 msgid "Edit group" msgstr "Gruppe bearbeiten" @@ -1495,84 +997,70 @@ 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 -#: includes/pages/user_news.php:113 includes/pages/user_news.php:170 -#: includes/pages/user_settings.php:193 includes/pages/user_settings.php:202 -#: includes/pages/user_settings.php:207 includes/pages/user_settings.php:212 -#: includes/pages/user_shifts.php:201 includes/view/AngelTypes_view.php:63 -#: includes/view/EventConfig_view.php:106 includes/view/Questions_view.php:32 -#: includes/view/ShiftEntry_view.php:32 includes/view/ShiftTypes_view.php:39 -#: includes/view/UserDriverLicenses_view.php:34 includes/view/User_view.php:86 -#: includes/view/User_view.php:317 -msgid "Save" -msgstr "Speichern" - -#: includes/pages/admin_groups.php:55 -msgid "Edit group" -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" -#: includes/pages/admin_import.php:25 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:25 msgid "Webserver has no write-permission on import directory." msgstr "Der Webserver hat keine Schreibrechte für das Verzeichnis import." -#: includes/pages/admin_import.php:53 includes/pages/admin_import.php:117 -#: includes/pages/admin_import.php:195 includes/pages/admin_shifts.php:53 -#: includes/pages/admin_shifts.php:59 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:53 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:117 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:195 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:53 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:59 msgid "Please select a shift type." msgstr "Bitte einen Schichttyp wählen." -#: includes/pages/admin_import.php:60 includes/pages/admin_import.php:124 -#: includes/pages/admin_import.php:202 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:60 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:124 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:202 msgid "Please enter an amount of minutes to add to a talk's begin." msgstr "" "Bitte gib eine Anzahl Minuten ein, die vor dem Talk-Beginn hinzugefügt " "werden sollen." -#: includes/pages/admin_import.php:67 includes/pages/admin_import.php:131 -#: includes/pages/admin_import.php:209 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:67 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:131 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:209 msgid "Please enter an amount of minutes to add to a talk's end." msgstr "" "Bitte gib eine Anzahl Minuten ein, die nach dem Talk-Ende hinzugefügt werden " "sollen." -#: includes/pages/admin_import.php:75 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:75 msgid "No valid xml/xcal file provided." msgstr "Keine valide xml/xcal Datei hochgeladen." -#: includes/pages/admin_import.php:80 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:80 msgid "File upload went wrong." msgstr "Das Hochladen der Datei ist schiefgegangen." -#: includes/pages/admin_import.php:84 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:84 msgid "Please provide some data." msgstr "Bitte lade eine Datei hoch." -#: includes/pages/admin_import.php:92 includes/pages/admin_import.php:139 -#: includes/pages/admin_import.php:252 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:92 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:139 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:252 msgid "File Upload" msgstr "Datei hochladen" -#: includes/pages/admin_import.php:92 includes/pages/admin_import.php:139 -#: includes/pages/admin_import.php:252 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:92 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:139 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:252 msgid "Validation" msgstr "Überprüfen" -#: includes/pages/admin_import.php:92 includes/pages/admin_import.php:101 -#: includes/pages/admin_import.php:139 includes/pages/admin_import.php:178 -#: includes/pages/admin_import.php:252 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:92 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:101 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:139 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:178 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:252 msgid "Import" msgstr "Importieren" -#: includes/pages/admin_import.php:96 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:96 msgid "" "This import will create/update/delete rooms and shifts by given FRAB-export " "file. The needed file format is xcal." @@ -1580,44 +1068,35 @@ 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" -#: includes/pages/admin_import.php:99 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:99 msgid "Add minutes to end" msgstr "Minuten nach Talk-Ende hinzufügen" -#: includes/pages/admin_import.php:100 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:100 msgid "xcal-File (.xcal)" msgstr "xcal-Datei (.xcal)" -#: includes/pages/admin_import.php:110 includes/pages/admin_import.php:184 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:110 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:184 msgid "Missing import file." msgstr "Import-Datei nicht vorhanden." -#: includes/pages/admin_import.php:143 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:143 msgid "Rooms to create" msgstr "Anzulegende Räume" -#: includes/pages/admin_import.php:147 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:147 msgid "Rooms to delete" msgstr "Zu löschende Räume" -#: includes/pages/admin_import.php:151 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:151 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 @@ -1638,78 +1117,46 @@ msgstr "Beginn" #: /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" -msgstr "Tag" - -#: includes/pages/admin_import.php:154 includes/pages/admin_import.php:163 -#: includes/pages/admin_import.php:172 includes/pages/admin_shifts.php:324 -#: includes/view/Shifts_view.php:94 -msgid "Start" -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" -#: includes/pages/admin_import.php:156 includes/pages/admin_import.php:165 -#: includes/pages/admin_import.php:174 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:156 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:165 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:174 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 -msgid "Title" -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" -#: includes/pages/admin_import.php:160 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:160 msgid "Shifts to update" msgstr "Zu aktualisierende Schichten" -#: includes/pages/admin_import.php:169 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:169 msgid "Shifts to delete" msgstr "Zu löschende Schichten" -#: includes/pages/admin_import.php:253 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:253 msgid "It's done!" msgstr "Erledigt!" -#: includes/pages/admin_log.php:4 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_log.php:4 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" -#: includes/pages/admin_news.php:31 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:31 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" @@ -1730,43 +1177,25 @@ 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" - -#: includes/pages/admin_news.php:33 includes/pages/user_messages.php:85 -#: includes/pages/user_news.php:112 includes/pages/user_news.php:168 -msgid "Message" -msgstr "Nachricht" - -#: includes/pages/admin_news.php:34 includes/pages/user_news.php:169 -msgid "Meeting" -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" -#: includes/pages/admin_news.php:52 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:52 msgid "News entry updated." msgstr "News-Eintrag gespeichert." -#: includes/pages/admin_news.php:61 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:61 msgid "News entry deleted." msgstr "News-Eintrag gelöscht." -#: includes/pages/admin_questions.php:4 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:4 msgid "Answer questions" msgstr "Fragen beantworten" -#: includes/pages/admin_questions.php:14 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:14 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" @@ -1799,53 +1228,21 @@ msgstr "Beantwortete Fragen" 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" - -#: includes/pages/admin_questions.php:68 includes/pages/admin_questions.php:75 -msgid "From" -msgstr "Von" - -#: includes/pages/admin_questions.php:69 includes/pages/admin_questions.php:76 -#: includes/view/Questions_view.php:19 includes/view/Questions_view.php:24 -msgid "Question" -msgstr "Frage" - -#: includes/pages/admin_questions.php:70 includes/pages/admin_questions.php:78 -#: includes/view/Questions_view.php:26 -msgid "Answer" -msgstr "Antwort" - -#: includes/pages/admin_questions.php:73 includes/view/Questions_view.php:22 -msgid "Answered questions" -msgstr "Beantwortete Fragen" - -#: includes/pages/admin_questions.php:77 includes/view/Questions_view.php:25 -msgid "Answered by" -msgstr "Antwort von" - -#: includes/pages/admin_rooms.php:4 includes/pages/user_shifts.php:881 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:4 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:166 +#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:196 msgid "Rooms" msgstr "Räume" -#: includes/pages/admin_rooms.php:63 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:67 msgid "This name is already in use." msgstr "Dieser Name ist bereits vergeben." -#: includes/pages/admin_rooms.php:93 ->>>>>>> pr/276 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:97 #, 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." @@ -1864,145 +1261,108 @@ 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." - -#: includes/pages/admin_rooms.php:144 includes/pages/admin_rooms.php:190 -msgid "Public" -msgstr "Öffentlich" - -#: includes/pages/admin_rooms.php:145 -msgid "Room number" -msgstr "Raumnummer" - -#: includes/pages/admin_rooms.php:150 -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" -#: includes/pages/admin_shifts.php:4 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:4 msgid "Create shifts" msgstr "Schichten erstellen" -#: includes/pages/admin_shifts.php:71 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:71 msgid "Please select a location." msgstr "Bitte einen Ort auswählen." -#: includes/pages/admin_shifts.php:78 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:78 msgid "Please select a start time." msgstr "Bitte eine Startzeit auswählen." -#: includes/pages/admin_shifts.php:85 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:85 msgid "Please select an end time." msgstr "Bitte eine Endzeit auswählen." -#: includes/pages/admin_shifts.php:90 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:90 msgid "The shifts end has to be after its start." msgstr "Die Endzeit muss nach der Startzeit liegen." -#: includes/pages/admin_shifts.php:102 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:102 msgid "Please enter a shift duration in minutes." msgstr "Gib bitte eine Schichtlänge in Minuten ein." -#: includes/pages/admin_shifts.php:110 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:110 msgid "Please split the shift-change hours by colons." msgstr "Trenne die Schichtwechselstunden mit einem Komma." -#: includes/pages/admin_shifts.php:115 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:115 msgid "Please select a mode." msgstr "Bitte einen Modus auswählen." -#: includes/pages/admin_shifts.php:128 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:128 #, php-format msgid "Please check the needed angels for team %s." msgstr "Bitte gib die Anzahl der benötigten Engel vom Team %s an." -#: includes/pages/admin_shifts.php:133 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:133 msgid "There are 0 angels needed. Please enter the amounts of needed angels." msgstr "Es werden 0 Engel benötigt. Bitte ändere das." -#: includes/pages/admin_shifts.php:137 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:137 msgid "Please select a mode for needed angels." msgstr "Bitte wähle einen Modus für benötigte Engel." -#: includes/pages/admin_shifts.php:141 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:141 msgid "Please select needed angels." msgstr "Bitte wähle benötigte Engel." -#: includes/pages/admin_shifts.php:268 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:268 msgid "Time and location" msgstr "Zeit und Ort" -#: includes/pages/admin_shifts.php:269 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:269 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" -#: includes/pages/admin_shifts.php:327 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:327 msgid "Create one shift" msgstr "Eine Schicht erstellen" -#: includes/pages/admin_shifts.php:328 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:328 msgid "Create multiple shifts" msgstr "Mehrere Schichten erstellen" -#: includes/pages/admin_shifts.php:330 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:330 msgid "Create multiple shifts with variable length" msgstr "Erstelle mehrere Schichten mit unterschiedlicher Länge" -#: includes/pages/admin_shifts.php:331 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:331 msgid "Shift change hours" msgstr "Schichtwechsel-Stunden" -#: includes/pages/admin_shifts.php:335 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:335 msgid "Take needed angels from room settings" msgstr "Übernehme benötigte Engel von den Raum-Einstellungen" -#: includes/pages/admin_shifts.php:336 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:336 msgid "The following angels are needed" msgstr "Die folgenden Engel werden benötigt" -#: includes/pages/admin_user.php:4 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:4 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." @@ -2024,51 +1384,20 @@ 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." - -#: includes/pages/admin_user.php:43 includes/pages/guest_login.php:212 -#: includes/pages/user_settings.php:188 -msgid "Please send me an email if my shifts change" -msgstr "Informiere mich per E-Mail über Änderungen an meinen Schichten" - -#: includes/pages/admin_user.php:48 includes/view/AngelTypes_view.php:58 -#: includes/view/AngelTypes_view.php:59 -msgid "Yes" -msgstr "Ja" - -#: includes/pages/admin_user.php:49 includes/view/AngelTypes_view.php:58 -#: includes/view/AngelTypes_view.php:59 -msgid "No" -msgstr "Nein" - -#: includes/pages/admin_user.php:62 -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" -#: includes/pages/guest_credits.php:3 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_credits.php:3 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 @@ -2078,40 +1407,23 @@ 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" -#: includes/pages/guest_login.php:12 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:12 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." @@ -2122,22 +1434,10 @@ 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." - -#: includes/pages/guest_login.php:93 -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." @@ -2147,17 +1447,6 @@ 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." - -#: includes/pages/guest_login.php:183 -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." @@ -2165,7 +1454,6 @@ 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 "" @@ -2210,34 +1498,6 @@ 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" - -#: includes/pages/guest_login.php:220 includes/pages/user_settings.php:191 -msgid "Shirt size" -msgstr "T-Shirt Größe" - -#: includes/pages/guest_login.php:225 includes/pages/guest_login.php:336 -#: includes/view/User_view.php:38 includes/view/User_view.php:315 -msgid "Password" -msgstr "Passwort" - -#: includes/pages/guest_login.php:228 includes/view/User_view.php:316 -msgid "Confirm password" -msgstr "Passwort wiederholen" - -#: includes/pages/guest_login.php:231 -msgid "What do you want to do?" -msgstr "Was möchtest Du machen?" - -#: includes/pages/guest_login.php:231 -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." @@ -2245,7 +1505,6 @@ 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" @@ -2286,41 +1545,6 @@ 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" - -#: includes/pages/guest_login.php:243 includes/pages/user_settings.php:184 -msgid "Phone" -msgstr "Telefon" - -#: includes/pages/guest_login.php:249 includes/pages/user_settings.php:180 -msgid "First name" -msgstr "Vorname" - -#: includes/pages/guest_login.php:252 includes/pages/user_settings.php:179 -msgid "Last name" -msgstr "Nachname" - -#: includes/pages/guest_login.php:257 includes/pages/user_settings.php:183 -msgid "Age" -msgstr "Alter" - -#: includes/pages/guest_login.php:260 includes/pages/user_settings.php:190 -msgid "Hometown" -msgstr "Wohnort" - -#: includes/pages/guest_login.php:263 includes/pages/user_settings.php:177 -msgid "Entry required!" -msgstr "Pflichtfeld!" - -#: includes/pages/guest_login.php:301 -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." @@ -2328,7 +1552,6 @@ 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." @@ -2350,54 +1573,26 @@ 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." - -#: includes/pages/guest_login.php:339 includes/view/User_view.php:41 -msgid "I forgot my password" -msgstr "Passwort vergessen" - -#: includes/pages/guest_login.php:341 includes/view/User_view.php:43 -msgid "Please note: You have to activate cookies!" -msgstr "Hinweis: Cookies müssen aktiviert sein!" - -#: includes/pages/guest_login.php:347 includes/view/User_view.php:47 -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." -#: includes/pages/user_messages.php:4 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:4 msgid "Messages" msgstr "Nachrichten" -#: includes/pages/user_messages.php:26 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:26 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" @@ -2407,28 +1602,10 @@ 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 -msgid "Unable to load user." -msgstr "Konnte Benutzer nicht laden." - -#: includes/pages/user_messages.php:68 -msgid "mark as read" -msgstr "als gelesen markieren" - -#: includes/pages/user_messages.php:71 -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" @@ -2465,49 +1642,10 @@ 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" - -#: includes/pages/user_messages.php:83 -msgid "Transmitted" -msgstr "Gesendet" - -#: includes/pages/user_messages.php:84 -msgid "Recipient" -msgstr "Empfänger" - -#: includes/pages/user_messages.php:96 includes/pages/user_messages.php:112 -msgid "Incomplete call, missing Message ID." -msgstr "Unvollständiger Aufruf, fehlende Nachrichten ID." - -#: includes/pages/user_messages.php:104 includes/pages/user_messages.php:120 -msgid "No Message found." -msgstr "Keine Nachricht gefunden." - -#: includes/pages/user_messages.php:128 -msgid "Transmitting was terminated with an Error." -msgstr "Übertragung wurde mit einem Fehler abgebrochen." - -#: includes/pages/user_messages.php:133 -msgid "Wrong action." -msgstr "Falsche Aktion." - -#: includes/pages/user_myshifts.php:4 includes/pages/user_shifts.php:325 -msgid "My shifts" -msgstr "Meine Schichten" - -#: includes/pages/user_myshifts.php:23 -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" -#: includes/pages/user_myshifts.php:27 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:27 msgid "" "If you reset the key, the url to your iCal- and JSON-export and your atom " "feed changes! You have to update it in every application using one of these " @@ -2516,31 +1654,23 @@ msgstr "" "Wenn du den API-Key zurücksetzt, ändert sich die URL zu deinem iCal-, JSON-" "Export und Atom Feed! Du musst diesen überall ändern, wo er in Benutzung ist." -#: includes/pages/user_myshifts.php:28 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:28 msgid "Continue" msgstr "Fortfahren" -#: includes/pages/user_myshifts.php:60 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:60 msgid "Please enter a freeload comment!" msgstr "Gib bitte einen Schwänz-Kommentar ein!" -#: includes/pages/user_myshifts.php:79 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:79 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." @@ -2548,19 +1678,18 @@ msgstr "" "Es ist zu spät um Dich aus der Schicht auszutragen. Wenn notwendig, frage " "einen Dispatcher dafür." -#: includes/pages/user_news.php:4 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:4 msgid "News comments" msgstr "News Kommentare" -#: includes/pages/user_news.php:8 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:8 msgid "News" msgstr "News" -#: includes/pages/user_news.php:12 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:12 msgid "Meetings" msgstr "Treffen" -<<<<<<< HEAD #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:68 msgid "Comments" msgstr "Kommentare" @@ -2579,33 +1708,14 @@ 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" - -#: includes/pages/user_news.php:89 includes/pages/user_news.php:133 -msgid "Entry saved." -msgstr "Eintrag gespeichert." - -#: includes/pages/user_news.php:110 -msgid "New Comment:" -msgstr "Neuer Kommentar:" - -#: includes/pages/user_news.php:116 -msgid "Invalid request." -msgstr "Ungültige Abfrage." - -#: includes/pages/user_news.php:164 ->>>>>>> pr/276 msgid "Create news:" msgstr "News anlegen:" -#: includes/pages/user_questions.php:4 includes/view/Questions_view.php:29 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:4 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:29 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." @@ -2647,15 +1757,15 @@ 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 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:92 msgid "-> not OK. Please try again." msgstr "-> Nicht OK. Bitte erneut versuchen." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:98 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:100 msgid "Failed setting password." msgstr "Konnte Passwort nicht speichern." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:123 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:125 msgid "Theme changed." msgstr "Aussehen geändert." @@ -2668,187 +1778,6 @@ 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." - -#: includes/pages/user_questions.php:32 -msgid "You question was saved." -msgstr "Frage gespeichert." - -#: includes/pages/user_questions.php:36 -msgid "Please enter a question!" -msgstr "Gib eine Frage ein!" - -#: includes/pages/user_questions.php:44 -msgid "Incomplete call, missing Question ID." -msgstr "Unvollständiger Aufruf, fehlende Fragen ID." - -#: includes/pages/user_questions.php:53 -msgid "No question found." -msgstr "Keine Frage gefunden." - -#: includes/pages/user_settings.php:4 includes/view/User_view.php:272 -msgid "Settings" -msgstr "Einstellungen" - -#: includes/pages/user_settings.php:71 -msgid "Please enter your planned date of departure." -msgstr "Bitte gib Dein geplantes Abreisedatum an." - -#: includes/pages/user_settings.php:126 -msgid "-> not OK. Please try again." -msgstr "-> Nicht OK. Bitte erneut versuchen." - -#: includes/pages/user_settings.php:134 -msgid "Failed setting password." -msgstr "Konnte Passwort nicht speichern." - -#: includes/pages/user_settings.php:149 -msgid "Theme changed." -msgstr "Aussehen geändert." - -#: includes/pages/user_settings.php:176 -msgid "Here you can change your user details." -msgstr "Hier kannst Du Deine Details ändern." - -#: includes/pages/user_settings.php:182 -msgid "Planned date of departure" -msgstr "Geplanter Abreisetag" - -#: includes/pages/user_settings.php:192 -msgid "Please visit the angeltypes page to manage your angeltypes." -msgstr "Bitte benutze die Engeltypen-Seite um deine Engeltypen zu verwalten." - -#: includes/pages/user_settings.php:198 -msgid "Here you can change your password." -msgstr "Hier kannst Du Dein Passwort ändern." - -#: includes/pages/user_settings.php:199 -msgid "Old password:" -msgstr "Altes Passwort:" - -#: includes/pages/user_settings.php:200 -msgid "New password:" -msgstr "Neues Passwort:" - -#: includes/pages/user_settings.php:201 -msgid "Password confirmation:" -msgstr "Passwort wiederholen:" - -#: includes/pages/user_settings.php:205 -msgid "Here you can choose your color settings:" -msgstr "Hier kannst Du das Aussehen auswählen:" - -#: includes/pages/user_settings.php:206 -msgid "Color settings:" -msgstr "Aussehen:" - -#: includes/pages/user_settings.php:210 -msgid "Here you can choose your language:" -msgstr "Hier kannst Du Deine Sprache auswählen:" - -#: includes/pages/user_settings.php:211 -msgid "Language:" -msgstr "Sprache:" - -#: includes/pages/user_shifts.php:47 -msgid "Shift entry deleted." -msgstr "Schicht-Eintrag gelöscht." - -#: includes/pages/user_shifts.php:49 -msgid "Entry not found." -msgstr "Eintrag nicht gefunden." - -#: includes/pages/user_shifts.php:120 -msgid "Please select a room." -msgstr "Bitte einen Raum auswählen." - -#: includes/pages/user_shifts.php:127 -msgid "Please select a shifttype." -msgstr "Bitte einen Schichttyp wählen." - -#: includes/pages/user_shifts.php:134 -msgid "Please enter a valid starting time for the shifts." -msgstr "Bitte gib eine korrekte Startzeit für die Schichten ein." - -#: includes/pages/user_shifts.php:141 -msgid "Please enter a valid ending time for the shifts." -msgstr "Bitte gib eine korrekte Endzeit für die Schichten ein." - -#: includes/pages/user_shifts.php:146 -msgid "The ending time has to be after the starting time." -msgstr "Die Endzeit muss nach der Startzeit liegen." - -#: includes/pages/user_shifts.php:154 -#, 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." - -#: includes/pages/user_shifts.php:177 -msgid "Shift updated." -msgstr "Schicht aktualisiert." - -#: includes/pages/user_shifts.php:192 -msgid "This page is much more comfortable with javascript." -msgstr "Diese Seite ist mit JavaScript viel komfortabler." - -#: includes/pages/user_shifts.php:196 -msgid "Room:" -msgstr "Raum:" - -#: includes/pages/user_shifts.php:197 -msgid "Start:" -msgstr "Start:" - -#: includes/pages/user_shifts.php:198 -msgid "End:" -msgstr "Ende:" - -#: includes/pages/user_shifts.php:228 -msgid "Shift deleted." -msgstr "Schicht gelöscht." - -#: includes/pages/user_shifts.php:233 -#, 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?" - -#: includes/pages/user_shifts.php:271 -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." - -#: includes/pages/user_shifts.php:325 -msgid "You are subscribed. Thank you!" -msgstr "Du bist eingetragen. Danke!" - -#: includes/pages/user_shifts.php:334 includes/view/User_view.php:249 -msgid "Freeloader" -msgstr "Schwänzer" - -#: includes/pages/user_shifts.php:366 -msgid "The administration has not configured any shifts yet." -msgstr "Die Administratoren haben noch keine Schichten angelegt." - -#: includes/pages/user_shifts.php:373 -msgid "The administration has not configured any rooms yet." -msgstr "Die Administratoren habe noch keine Räume eingerichtet." - -#: includes/pages/user_shifts.php:388 -msgid "occupied" -msgstr "belegt" - -#: includes/pages/user_shifts.php:392 -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." @@ -2856,7 +1785,6 @@ 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" @@ -2870,54 +1798,12 @@ 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" -msgid_plural "%d helpers needed" -msgstr[0] "%d Helfer benötigt" -msgstr[1] "%d Helfer benötigt" - -#: includes/pages/user_shifts.php:692 includes/view/Shifts_view.php:25 -msgid "Sign up" -msgstr "Eintragen" - -#: includes/pages/user_shifts.php:695 -msgid "ended" -msgstr "vorbei" - -#: includes/pages/user_shifts.php:703 includes/pages/user_shifts.php:846 -#: includes/view/Shifts_view.php:27 -#, php-format -msgid "Become %s" -msgstr "Werde ein %s" - -#: includes/pages/user_shifts.php:716 includes/pages/user_shifts.php:859 -msgid "Add more angels" -msgstr "Neue Engel hinzufügen" - -#: includes/pages/user_shifts.php:867 includes/view/User_view.php:282 -msgid "Time" -msgstr "Zeit" - -#: includes/pages/user_shifts.php:868 -msgid "Entries" -msgstr "Einträge" - -#: includes/pages/user_shifts.php:887 -msgid "Occupancy" -msgstr "Belegung" - -#: includes/pages/user_shifts.php:888 ->>>>>>> pr/276 msgid "" "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." @@ -2927,21 +1813,6 @@ 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." - -#: includes/pages/user_shifts.php:889 -msgid "Use new style if possible" -msgstr "Wenn möglich neuen Stil verwenden" - -#: includes/pages/user_shifts.php:891 -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" @@ -2952,7 +1823,6 @@ 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" @@ -2966,29 +1836,7 @@ msgstr "Alle" 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" - -#: includes/pages/user_shifts.php:931 includes/view/ShiftTypes_view.php:23 -msgid "All" -msgstr "Alle" - -#: includes/pages/user_shifts.php:932 -msgid "None" -msgstr "Keine" - -#: includes/sys_menu.php:56 +#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:36 msgid "" "Please enter your planned date of departure on your settings page to give us " "a feeling for teardown capacities." @@ -2996,7 +1844,7 @@ msgstr "" "Bitte gib Dein geplantes Abreisedatum an, damit wir ein Gefühl für die Abbau-" "Planung bekommen." -#: includes/sys_menu.php:65 +#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:45 #, php-format msgid "" "You freeloaded at least %s shifts. Shift signup is locked. Please go to " @@ -3005,7 +1853,7 @@ msgstr "" "Du hast mindestens %s Schichten geschwänzt. Schicht-Registrierung ist " "gesperrt. Bitte gehe zum Himmelsschreibtisch um wieder entsperrt zu werden." -#: includes/sys_menu.php:72 +#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:52 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." @@ -3013,11 +1861,11 @@ 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." -#: includes/sys_menu.php:78 +#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:58 msgid "You need to specify a tshirt size in your settings!" msgstr "Bitte eine T-Shirt-Größe auswählen" -#: includes/sys_menu.php:84 +#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:64 msgid "" "You need to specify a DECT phone number in your settings! If you don't have " "a DECT phone, just enter \"-\"." @@ -3025,56 +1873,59 @@ msgstr "" "Bitte eine DECT-Telefonnummer in den Einstellungen eingeben. Wenn du noch " "keine Nummer hast, bitte einfach \"-\" angeben." -#: includes/sys_menu.php:155 +#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:165 msgid "Admin" msgstr "Admin" -#: includes/sys_template.php:364 +#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:187 +msgid "Manage rooms" +msgstr "Verwalte Räume" + +#: /Users/msquare/workspace/projects/engelsystem/includes/sys_template.php:165 msgid "No data found." msgstr "Nichts gefunden." -#: includes/view/AngelTypes_view.php:27 includes/view/AngelTypes_view.php:201 +#: /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" -#: includes/view/AngelTypes_view.php:29 includes/view/AngelTypes_view.php:33 -msgid "Coordinator" -msgstr "Koordinator" ->>>>>>> pr/276 +#: /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/view/AngelTypes_view.php:31 includes/view/AngelTypes_view.php:35 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:31 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:35 msgid "Member" msgstr "Mitglied" -#: includes/view/AngelTypes_view.php:42 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:42 #, php-format msgid "Do you want to delete angeltype %s?" msgstr "Möchtest Du den Engeltypen %s löschen?" -#: includes/view/AngelTypes_view.php:44 includes/view/ShiftTypes_view.php:15 -#: includes/view/UserAngelTypes_view.php:8 -#: includes/view/UserAngelTypes_view.php:19 -#: includes/view/UserAngelTypes_view.php:30 -#: includes/view/UserAngelTypes_view.php:41 -#: includes/view/UserAngelTypes_view.php:52 -#: includes/view/UserAngelTypes_view.php:82 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:44 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:15 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:8 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:19 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:30 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:41 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:52 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:82 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" -#: includes/view/AngelTypes_view.php:59 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:59 msgid "Requires driver license" msgstr "Benötigt Führerschein" -#: includes/view/AngelTypes_view.php:60 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:60 msgid "" "Restricted angel types can only be used by an angel if enabled by an " "archangel (double opt-in)." @@ -3082,35 +1933,23 @@ 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 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:118 msgid "Description" msgstr "Beschreibung" -#: includes/view/AngelTypes_view.php:62 includes/view/ShiftTypes_view.php:38 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:62 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:38 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!" @@ -3118,11 +1957,7 @@ 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 " @@ -3131,7 +1966,6 @@ 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" @@ -3216,84 +2050,6 @@ 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" - -#: includes/view/AngelTypes_view.php:127 -msgid "deny" -msgstr "ablehnen" - -#: includes/view/AngelTypes_view.php:143 -msgid "remove" -msgstr "entfernen" - -#: includes/view/AngelTypes_view.php:160 -msgid "Driver" -msgstr "Fahrer" - -#: includes/view/AngelTypes_view.php:161 -msgid "Has car" -msgstr "Hat Auto" - -#: includes/view/AngelTypes_view.php:162 -#: includes/view/UserDriverLicenses_view.php:27 -msgid "Car" -msgstr "Auto" - -#: includes/view/AngelTypes_view.php:163 -msgid "3,5t Transporter" -msgstr "3,5t Transporter" - -#: includes/view/AngelTypes_view.php:164 -msgid "7,5t Truck" -msgstr "7,5t LKW" - -#: includes/view/AngelTypes_view.php:165 -msgid "12,5t Truck" -msgstr "12,5t LKW" - -#: includes/view/AngelTypes_view.php:166 -#: includes/view/UserDriverLicenses_view.php:31 -msgid "Forklift" -msgstr "Gabelstapler" - -#: includes/view/AngelTypes_view.php:172 -msgid "Coordinators" -msgstr "Koordinatoren" - -#: includes/view/AngelTypes_view.php:192 -msgid "Members" -msgstr "Mitglieder" - -#: includes/view/AngelTypes_view.php:195 -#: includes/view/UserAngelTypes_view.php:72 -msgid "Add" -msgstr "Hinzufügen" - -#: includes/view/AngelTypes_view.php:203 -msgid "confirm all" -msgstr "Alle bestätigen" - -#: includes/view/AngelTypes_view.php:204 -msgid "deny all" -msgstr "Alle ablehnen" - -#: includes/view/AngelTypes_view.php:221 -msgid "New angeltype" -msgstr "Neuer Engeltyp" - -#: includes/view/AngelTypes_view.php:227 -msgid "Membership" -msgstr "Mitgliedschaft" - -#: includes/view/AngelTypes_view.php:241 -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." @@ -3301,106 +2057,93 @@ 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 " -"show up at the according introduction meetings." -msgstr "" -"Dieser Engeltyp muss zusätzlich von einem Team-Koordinator freigeschaltet " -"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." -#: includes/view/EventConfig_view.php:19 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:19 #, php-format msgid "from %s to %s" msgstr "von %s bis %s" -#: includes/view/EventConfig_view.php:23 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:23 #, php-format msgid "Buildup starts in %c" msgstr "Aufbau startet in %c" -#: includes/view/EventConfig_view.php:27 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:27 #, php-format msgid "Event starts in %c" msgstr "Event startet in %c" -#: includes/view/EventConfig_view.php:31 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:31 #, php-format msgid "Event ends in %c" msgstr "Event endet in %c" -#: includes/view/EventConfig_view.php:35 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:35 #, php-format msgid "Teardown ends in %c" msgstr "Abbau endet in %c" -#: includes/view/EventConfig_view.php:51 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:51 #, php-format msgid "%s, from %s to %s" msgstr "%s, von %s bis %s" -#: includes/view/EventConfig_view.php:56 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:56 #, php-format msgid "%s, starting %s" msgstr "%s, ab %s" -#: includes/view/EventConfig_view.php:61 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:61 #, php-format msgid "Event from %s to %s" msgstr "Event von %s bis %s" -#: includes/view/EventConfig_view.php:90 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:90 msgid "Event Name" msgstr "Event Name" -#: includes/view/EventConfig_view.php:91 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:91 msgid "Event Name is shown on the start page." msgstr "Event Name wird auf der Startseite angezeigt." -#: includes/view/EventConfig_view.php:92 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:92 msgid "Event Welcome Message" msgstr "Event Willkommens-Nachricht" -#: includes/view/EventConfig_view.php:93 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:93 msgid "" "Welcome message is shown after successful registration. You can use markdown." msgstr "" "Die Willkommens-Nachricht wird nach einer erfolgreichen Registrierung " "angezeigt. Du kannst Markdown benutzen." -#: includes/view/EventConfig_view.php:96 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:96 msgid "Buildup date" msgstr "Aufbau Datum" -#: includes/view/EventConfig_view.php:97 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:97 msgid "Event start date" msgstr "Event Start Datum" -#: includes/view/EventConfig_view.php:100 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:100 msgid "Teardown end date" msgstr "Abbau Ende Datum" -#: includes/view/EventConfig_view.php:101 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:101 msgid "Event end date" msgstr "Event Ende Datum" -#: includes/view/Questions_view.php:17 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:17 msgid "Open questions" msgstr "Offene Fragen" -#: includes/view/Questions_view.php:31 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:31 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" @@ -3487,78 +2230,41 @@ 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" -msgstr "Geschwänzt" - -#: includes/view/ShiftEntry_view.php:19 -msgid "Freeload comment (Only for shift coordination):" -msgstr "Schwänzer Kommentar (Nur für die Schicht-Koordination):" - -#: includes/view/ShiftEntry_view.php:22 -msgid "Edit shift entry" -msgstr "Schichteintrag bearbeiten" - -#: includes/view/ShiftEntry_view.php:25 -msgid "Angel:" -msgstr "Engel:" - -#: includes/view/ShiftEntry_view.php:26 -msgid "Date, Duration:" -msgstr "Termin, Dauer:" - -#: includes/view/ShiftEntry_view.php:27 -msgid "Location:" -msgstr "Ort:" - -#: includes/view/ShiftEntry_view.php:28 -msgid "Title:" -msgstr "Titel:" - -#: includes/view/ShiftEntry_view.php:29 -msgid "Type:" -msgstr "Typ:" - -#: includes/view/ShiftEntry_view.php:30 ->>>>>>> pr/276 msgid "Comment (for your eyes only):" msgstr "Kommentar (nur für Dich):" -#: includes/view/ShiftTypes_view.php:13 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:13 #, php-format msgid "Do you want to delete shifttype %s?" msgstr "Möchtest Du den Schichttypen %s löschen?" -#: includes/view/ShiftTypes_view.php:29 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:29 msgid "Edit shifttype" msgstr "Schichttyp bearbeiten" -#: includes/view/ShiftTypes_view.php:29 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:29 msgid "Create shifttype" msgstr "Schichttyp erstellen" -#: includes/view/ShiftTypes_view.php:48 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:48 #, php-format msgid "for team %s" msgstr "für Team %s" -#: includes/view/ShiftTypes_view.php:74 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:74 msgid "New shifttype" msgstr "Neuer Schichttyp" -#: includes/view/Shifts_view.php:6 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:6 #, php-format msgid "created at %s by %s" msgstr "erstellt am %s von %s" -#: includes/view/Shifts_view.php:9 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:9 #, php-format 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." @@ -3569,82 +2275,70 @@ 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." - -#: includes/view/Shifts_view.php:81 -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" -#: includes/view/UserAngelTypes_view.php:6 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:6 #, php-format -msgid "Do you really want to add coordinator rights for %s to %s?" -msgstr "Sollen %s %s als neuen Koordinator bekommen?" +msgid "Do you really want to add supporter rights for %s to %s?" +msgstr "Sollen %s %s als neuen Supporter bekommen?" -#: includes/view/UserAngelTypes_view.php:6 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:6 #, php-format -msgid "Do you really want to remove coordinator rights for %s from %s?" -msgstr "Möchtest Du wirklich %s von %s als Koordinator befreien?" +msgid "Do you really want to remove supporter rights for %s from %s?" +msgstr "Möchtest Du wirklich %s von %s als Supporter befreien?" -#: includes/view/UserAngelTypes_view.php:17 +#: /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?" -#: includes/view/UserAngelTypes_view.php:28 +#: /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?" -#: includes/view/UserAngelTypes_view.php:39 +#: /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?" -#: includes/view/UserAngelTypes_view.php:50 +#: /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?" -#: includes/view/UserAngelTypes_view.php:71 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:71 msgid "User" msgstr "Benutzer" -#: includes/view/UserAngelTypes_view.php:80 +#: /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?" -#: includes/view/UserAngelTypes_view.php:83 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:83 msgid "save" msgstr "Speichern" -#: includes/view/UserDriverLicenses_view.php:17 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:17 msgid "Back to profile" msgstr "Zurück zum Profil" -#: includes/view/UserDriverLicenses_view.php:21 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:21 msgid "Privacy" msgstr "Privatsphäre" -#: includes/view/UserDriverLicenses_view.php:21 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:21 msgid "" -"Your driving license information is only visible for coordinators and admins." -msgstr "" -"Deine Führerschein-Infos sind nur für Koordinatoren und Admins sichtbar." +"Your driving license information is only visible for supporters and admins." +msgstr "Deine Führerschein-Infos sind nur für Supporter und Admins sichtbar." -#: includes/view/UserDriverLicenses_view.php:22 +#: /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" -#: includes/view/UserDriverLicenses_view.php:25 +#: /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)" @@ -3652,27 +2346,26 @@ 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)" -#: includes/view/UserDriverLicenses_view.php:26 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:26 msgid "Driver license" msgstr "Führerschein" -#: includes/view/UserDriverLicenses_view.php:28 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:28 msgid "Transporter 3,5t" msgstr "3,5t Transporter" -#: includes/view/UserDriverLicenses_view.php:29 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:29 msgid "Truck 7,5t" msgstr "7,5t LKW" -#: includes/view/UserDriverLicenses_view.php:30 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:30 msgid "Truck 12,5t" msgstr "12,5t LKW" -#: includes/view/User_view.php:7 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:7 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." @@ -3722,13 +2415,6 @@ 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?" @@ -3736,24 +2422,15 @@ 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" @@ -3803,76 +2480,20 @@ 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" - -#: includes/view/User_view.php:99 -msgid "m/d/Y h:i a" -msgstr "d.m.Y H:i" - -#: includes/view/User_view.php:118 -msgid "New user" -msgstr "Neuer User" - -#: includes/view/User_view.php:122 -msgid "Prename" -msgstr "Vorname" - -#: includes/view/User_view.php:125 includes/view/User_view.php:251 -msgid "Arrived" -msgstr "Angekommen" - -#: includes/view/User_view.php:126 -msgid "Voucher" -msgstr "Voucher" - -#: includes/view/User_view.php:127 -msgid "Freeloads" -msgstr "Schwänzereien" - -#: includes/view/User_view.php:128 includes/view/User_view.php:253 -msgid "Active" -msgstr "Aktiv" - -#: includes/view/User_view.php:130 includes/view/User_view.php:254 -msgid "T-Shirt" -msgstr "T-Shirt" - -#: includes/view/User_view.php:132 -msgid "Last login" -msgstr "Letzter Login" - -#: includes/view/User_view.php:149 -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" @@ -3886,54 +2507,26 @@ 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" - -#: includes/view/User_view.php:229 -msgid "Sum:" -msgstr "Summe:" - -#: includes/view/User_view.php:248 -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" @@ -3975,49 +2568,6 @@ 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" - -#: includes/view/User_view.php:261 -msgid "Rights" -msgstr "Rechte" - -#: includes/view/User_view.php:269 -msgid "driving license" -msgstr "Führerschein" - -#: includes/view/User_view.php:271 -msgid "Edit vouchers" -msgstr "Voucher bearbeiten" - -#: includes/view/User_view.php:273 -msgid "iCal Export" -msgstr "iCal Export" - -#: includes/view/User_view.php:274 -msgid "JSON Export" -msgstr "JSON Export" - -#: includes/view/User_view.php:284 -msgid "Name & workmates" -msgstr "Name & Kollegen" - -#: includes/view/User_view.php:285 -msgid "Comment" -msgstr "Kommentar" - -#: includes/view/User_view.php:286 -msgid "Action" -msgstr "Aktion" - -#: includes/view/User_view.php:288 -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 " @@ -4026,11 +2576,7 @@ 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." @@ -4039,7 +2585,6 @@ 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" @@ -4048,110 +2593,11 @@ msgstr "Wiederherstellen" 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" - -#: includes/view/User_view.php:313 -msgid "Please enter a new password." -msgstr "Gib bitte ein neues Passwort ein." - -#: public/index.php:152 -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!" @@ -4159,7 +2605,6 @@ 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." @@ -4180,17 +2625,6 @@ msgstr "" #~ msgid "Coordinators" #~ msgstr "Koordinatoren" -======= -#~ msgid "Please select a user." -#~ msgstr "Bitte einen Benutzer auswählen." - -#~ msgid "" -#~ "By completing this form you're registering as a Chaos-Angel. This script " -#~ "will create you an account in the angel task sheduler." -#~ msgstr "" -#~ "Mit diesem Formular registrierst Du Dich als Engel. Du bekommst ein Konto " -#~ "in der Engel-Aufgabenverwaltung." ->>>>>>> pr/276 #~ msgid " vouchers." #~ msgstr " Vouchers." |