From 4684d708fb93304379314bea24ca8d5648877108 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20H=C3=A4usler?= Date: Mon, 28 Dec 2015 17:47:02 +0100 Subject: [PATCH] better shift cancel messages and workflow --- includes/pages/user_myshifts.php | 4 +- locale/de_DE.UTF-8/LC_MESSAGES/default.mo | Bin 36668 -> 37135 bytes locale/de_DE.UTF-8/LC_MESSAGES/default.po | 213 ++++++++++++---------- 3 files changed, 122 insertions(+), 95 deletions(-) diff --git a/includes/pages/user_myshifts.php b/includes/pages/user_myshifts.php index 9e76636c..278a7134 100644 --- a/includes/pages/user_myshifts.php +++ b/includes/pages/user_myshifts.php @@ -22,7 +22,7 @@ function user_myshifts() { if ($_REQUEST['reset'] == "ack") { User_reset_api_key($user); success(_("Key changed.")); - redirect(page_link_to('user_myshifts')); + redirect(page_link_to('users') . '&action=view&user_id=' . $shifts_user['UID']); } return page_with_title(_("Reset API key"), array( error(_("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 exports."), true), @@ -94,7 +94,7 @@ function user_myshifts() { $shifttype = ShiftType($shift['shifttype_id']); engelsystem_log("Deleted own shift: " . $shifttype['name'] . " at " . $room['Name'] . " from " . date("Y-m-d H:i", $shift['start']) . " to " . date("Y-m-d H:i", $shift['end']) . " as " . $angeltype['name']); - success(_("You have been signed off from the shift.")); + success(_("Shift canceled.")); } else error(_("It's too late to sign yourself off the shift. If neccessary, ask the dispatcher to do so.")); } else diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo index 5024f81d95272b7b17d86c2b3d5af0594c54caab..c44c9a58be58cf03d42333077837064bbb147483 100644 GIT binary patch delta 10777 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

Szn<^?U^@;|Z*Wr?C=VM)h|U+tI)C zvn_~y*xX3Ms+9Mz_OlK}4Qv$Z12q-Z!BTsF6;>y|9)qzIHPAOu?VUt*d=@paFVX8q z;yV(W;V-DeRP7P|V8liG!L^+jOuT0E-;vHD{Wn}dOta#0ZmhVoBd^ z>*Y|ELVBgR zNem^jsrMQ&m$a^x+J8QJ|90JBZ%)Og#NFI2LSJGc@iKAg-=5$@M47IWhJXDmwyA;K ze}kAsz738fbUo%J5ks6Z`Ldr+@pC0*&*2g*AYLNQlOKma<9IB;s*~0`K7`OK{0RA* z*aYifG9Je3gsxa(8D$@%w>dwaAl@f*2FkDFBy^Zo5jTi6JfN#Ph7mQ0W5kb?y+Rx$ zU6W`}=<>&@Ch5F`-HA!WtCZi1_VPMID0qMvKDlV44&v*k_g zLmBu0QDpP_B@;}YP1p$ECaMzG$nQd3pAdf#`ug>uY#Z*zI`)1ut$#fV%da=>jq?0{ z@_Pw=Hn$R6%5UI&;wkQp$6o*OoT@!(%N8lab%@wV*|Wqc!jF6}d;ZFP$DgBM0-@^- zBA-fsBVHtQb;MBORnlXLe#BkmeNfj1()Zwp#9b=jdWf>Ngs#66JxT8)BFjqH|ITDm zZKj;hNmQ{9<>6}b&*4s6VKk1j>7|s1kX~TxtN19h|kKhMHbISCqccCp8wTUd^ zdG3|Hf7M7#AsUdKfVGH8L^An@REKl{d_lw$dBpuhPon&aqE2ICCZX$fq95r^HlKsF zDBG-?Tr&*j{jXpvwZ=@FF2CP}{I_Jb;aOZ-egh+jtTy9i(p&PmuO{NDL=t6MwxLlQ~TVAL1K(V}*67wKJyK^f25?-A}O;J;d{*SKthy zA?ap#f~Z93`cV77mP{j)FZ&Ns_LH7R*+g45hIC&d*XG58#A2I&6UW%}v-q-2_vaa1 z%P|JCZC+&~YKR@40&nS0Z>DUyX zz|zO=n&aE5gDbv$a$?(<*72=d`}gk`JHS0Dr!Xhq6PuD*(g!;|H9jmhy$n>hNwYuRp(Q(k3Keu1gcO|$a+S*P^( zVPDo+`uO;2oyx1ab383wSvhW(p2>2L`|szn-Dz1u6O2ejw2bE?mIPLpSv_eDQ delta 10305 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 diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.po b/locale/de_DE.UTF-8/LC_MESSAGES/default.po index 023564bb..5ef5027a 100644 --- a/locale/de_DE.UTF-8/LC_MESSAGES/default.po +++ b/locale/de_DE.UTF-8/LC_MESSAGES/default.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: Engelsystem 2.0\n" -"POT-Creation-Date: 2015-12-20 20:53+0100\n" -"PO-Revision-Date: 2015-12-21 14:22+0100\n" +"POT-Creation-Date: 2015-12-28 17:45+0100\n" +"PO-Revision-Date: 2015-12-28 17:46+0100\n" "Last-Translator: msquare \n" "Language-Team: \n" "Language: de_DE\n" @@ -92,24 +92,24 @@ msgstr "Lösche Engeltyp %s" 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:164 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:163 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:54 #, php-format msgid "Edit %s" msgstr "%s bearbeiten" -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:200 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:199 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:200 #, php-format msgid "Team %s" msgstr "Team %s" -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:220 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:219 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:153 msgid "view" msgstr "ansehen" -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:224 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:223 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:64 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:23 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:18 @@ -122,7 +122,7 @@ msgstr "ansehen" msgid "edit" msgstr "bearbeiten" -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:225 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:224 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:37 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:56 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:19 @@ -138,13 +138,13 @@ msgstr "bearbeiten" msgid "delete" msgstr "löschen" -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:230 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:229 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:87 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:244 msgid "leave" msgstr "verlassen" -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:232 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:231 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:80 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:246 msgid "join" @@ -358,15 +358,15 @@ msgstr "Führerschein-Infos" msgid "Please select at least one driving license." msgstr "Bitte wähle mindestens einen Führerschein-Typen aus." -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:120 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:121 msgid "Your driver license information has been removed." msgstr "Deine Führerschein-Infos wurden gelöscht." -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:131 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:133 msgid "Your driver license information has been saved." msgstr "Deine Führerschein-Infos wurden gespeichert." -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:139 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:141 #: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:15 #, php-format msgid "Edit %s driving license information" @@ -567,8 +567,8 @@ msgstr "Engel wurde als aktiv markiert." #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:71 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:80 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:98 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:21 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:30 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:22 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:32 msgid "Angel not found." msgstr "Engel nicht gefunden." @@ -601,9 +601,9 @@ msgid "remove t-shirt" msgstr "entferne t-shirt" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:160 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:154 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:169 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:184 +#: /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/AngelTypes_view.php:172 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:179 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:52 @@ -619,8 +619,8 @@ msgid "Show all shifts" msgstr "Alle Schichten anzeigen" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:169 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:130 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:131 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:132 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:133 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:71 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:80 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_log.php:25 @@ -639,7 +639,7 @@ msgid "Preview" msgstr "Vorschau" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:177 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:134 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:136 msgid "Nickname" msgstr "Nick" @@ -693,11 +693,11 @@ msgstr "Angekommene Engel" msgid "Reset done. Angel has not arrived." msgstr "Zurückgesetzt. Engel ist nicht angekommen." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:28 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:29 msgid "Angel has been marked as arrived." msgstr "Engel wurde als angekommen markiert." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:63 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:65 #: /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 @@ -706,63 +706,63 @@ msgstr "Engel wurde als angekommen markiert." msgid "yes" msgstr "Ja" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:64 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:66 msgid "reset" msgstr "zurücksetzen" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:64 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:145 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:160 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:175 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:66 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:147 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:162 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:177 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:209 msgid "arrived" msgstr "angekommen" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:135 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:137 msgid "Planned arrival" msgstr "Geplanter Ankunftstag" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:136 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:138 msgid "Arrived?" msgstr "Angekommen?" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:137 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:139 msgid "Arrival date" msgstr "Ankunftsdatum" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:138 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:140 msgid "Planned departure" msgstr "Geplante Abreise" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:143 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:145 msgid "Planned arrival statistics" msgstr "Geplante Ankunfts-Statistik" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:146 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:161 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:176 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:148 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:163 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:178 msgid "arrived sum" msgstr "Summe angekommen" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:152 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:167 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:182 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:154 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:169 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:184 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:27 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:71 msgid "Date" msgstr "Datum" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:153 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:168 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:183 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:155 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:170 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:185 msgid "Count" msgstr "Anzahl" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:158 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:160 msgid "Arrival statistics" msgstr "Ankunfts-Statistik" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:173 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:175 msgid "Planned departure statistics" msgstr "Geplante Abreise-Statistik" @@ -817,8 +817,8 @@ msgid "Grouprights" msgstr "Gruppenrechte" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:29 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:109 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:113 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:141 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:145 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:130 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:175 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:60 @@ -870,47 +870,63 @@ msgstr "Frab Import" msgid "Webserver has no write-permission on import directory." msgstr "Der Webserver hat keine Schreibrechte für das Verzeichnis import." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:48 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:96 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:159 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:50 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:114 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:191 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:48 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:53 msgid "Please select a shift type." msgstr "Bitte einen Schichttyp wählen." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:56 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:57 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:121 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:198 +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." + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:64 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:128 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:205 +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." + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:72 msgid "No valid xml/xcal file provided." msgstr "Keine valide xml/xcal Datei hochgeladen." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:61 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:77 msgid "File upload went wrong." msgstr "Das Hochladen der Datei ist schiefgegangen." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:65 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:81 msgid "Please provide some data." msgstr "Bitte lade eine Datei hoch." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:73 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:104 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:197 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:89 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:136 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:243 msgid "File Upload" msgstr "Datei hochladen" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:73 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:104 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:197 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:89 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:136 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:243 msgid "Validation" msgstr "Überprüfen" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:73 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:80 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:104 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:143 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:197 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:89 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:98 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:136 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:175 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:243 msgid "Import" msgstr "Importieren" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:77 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:93 msgid "" "This import will create/update/delete rooms and shifts by given FRAB-export " "file. The needed file format is xcal." @@ -918,88 +934,96 @@ msgstr "" "Dieser Import erzeugt, ändert und löscht Räume und Schichten anhand einer " "FRAB-Export Datei. Das benötigte Format ist xcal." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:78 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:94 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:301 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:184 msgid "Shifttype" msgstr "Schichttyp" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:79 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:95 +msgid "Add minutes to start" +msgstr "Minuten vor Talk-Beginn hinzufügen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:96 +msgid "Add minutes to end" +msgstr "Minuten nach Talk-Ende hinzufügen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:97 msgid "xcal-File (.xcal)" msgstr "xcal-Datei (.xcal)" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:89 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:149 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:107 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:181 msgid "Missing import file." msgstr "Import-Datei nicht vorhanden." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:108 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:140 msgid "Rooms to create" msgstr "Anzulegende Räume" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:112 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:144 msgid "Rooms to delete" msgstr "Zu löschende Räume" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:116 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:148 msgid "Shifts to create" msgstr "Anzulegende Schichten" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:118 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:127 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:136 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:150 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:159 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:168 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:220 msgid "Day" msgstr "Tag" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:119 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:128 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:137 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:151 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:160 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:169 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:306 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:88 msgid "Start" msgstr "Beginn" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:120 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:129 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:138 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:152 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:161 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:170 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:307 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:96 msgid "End" msgstr "Ende" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:121 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:130 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:139 +#: /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 msgid "Shift type" msgstr "Schichttyp" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:122 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:131 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:140 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:154 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:163 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:172 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:302 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:185 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:84 msgid "Title" msgstr "Titel" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:123 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:132 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:141 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:155 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:164 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:173 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:303 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:803 msgid "Room" msgstr "Raum" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:125 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:157 msgid "Shifts to update" msgstr "Zu aktualisierende Schichten" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:134 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:166 msgid "Shifts to delete" msgstr "Zu löschende Schichten" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:198 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:244 msgid "It's done!" msgstr "Erledigt!" @@ -1515,8 +1539,8 @@ msgid "Shift saved." msgstr "Schicht gespeichert." #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:97 -msgid "You have been signed off from the shift." -msgstr "Du wurdest aus der Schicht ausgetragen." +msgid "Shift canceled." +msgstr "Schichteintrag gelöscht." #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:99 msgid "" @@ -2378,6 +2402,9 @@ msgstr "" "Du hast keinen Zugriff auf diese Seite. Registriere Dich und logge Dich " "bitte ein, um Zugriff zu erhalten!" +#~ msgid "You have been signed off from the shift." +#~ msgstr "Du wurdest aus der Schicht ausgetragen." + #~ msgid "planned departure" #~ msgstr "Geplante Abreise"