From 33031a9c622ba8b1fb09aa4c1cc16a665375915d Mon Sep 17 00:00:00 2001 From: Leandra Eberle Date: Sat, 26 Nov 2016 16:22:35 +0100 Subject: [PATCH 1/6] Update Descriptions --- .idea/vcs.xml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .idea/vcs.xml diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..94a25f7f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From 0401e90f005bf1292aee6f61d0a7970a1dc0da2b Mon Sep 17 00:00:00 2001 From: Leandra Eberle Date: Sat, 26 Nov 2016 16:23:49 +0100 Subject: [PATCH 2/6] Update Descriptions --- includes/view/AngelTypes_view.php | 2 +- locale/de_DE.UTF-8/LC_MESSAGES/default.po | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/includes/view/AngelTypes_view.php b/includes/view/AngelTypes_view.php index 04c0e286..318cd075 100644 --- a/includes/view/AngelTypes_view.php +++ b/includes/view/AngelTypes_view.php @@ -65,7 +65,7 @@ function AngelType_edit_view($angeltype, $supporter_mode) { $supporter_mode ? form_info(_("Name"), $angeltype['name']) : form_text('name', _("Name"), $angeltype['name']), $supporter_mode ? form_info(_("Restricted"), $angeltype['restricted'] ? _("Yes") : _("No")) : form_checkbox('restricted', _("Restricted"), $angeltype['restricted']), $supporter_mode ? form_info(_("Requires driver license"), $angeltype['requires_driver_license'] ? _("Yes") : _("No")) : form_checkbox('requires_driver_license', _("Requires driver license"), $angeltype['requires_driver_license']), - form_info("", _("Restricted angel types can only be used by an angel if enabled by an archangel (double opt-in).")), + form_info("", _("Restricted angel types can only be used by an angel if enabled by a supprter (double opt-in).")), form_textarea('description', _("Description"), $angeltype['description']), form_info("", _("Please use markdown for the description.")), form_submit('submit', _("Save")) diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.po b/locale/de_DE.UTF-8/LC_MESSAGES/default.po index e0838ecf..34c34707 100644 --- a/locale/de_DE.UTF-8/LC_MESSAGES/default.po +++ b/locale/de_DE.UTF-8/LC_MESSAGES/default.po @@ -1710,8 +1710,8 @@ msgstr "News anlegen:" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:4 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:29 -msgid "Ask the Heaven" -msgstr "Frage den Himmel" +msgid "Ask Heaven" +msgstr "Frag den Himmel" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:27 msgid "Unable to save question." @@ -1887,10 +1887,10 @@ msgstr "Benötigt Führerschein" #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:68 msgid "" -"Restricted angel types can only be used by an angel if enabled by an " -"archangel (double opt-in)." +"Restricted angel types can only be used by an angel if enabled by a" +"supporter (double opt-in)." msgstr "" -"Beschränkte Engeltypen müssen von einem Erzengel oder Team-Koordinator " +"Beschränkte Engeltypen müssen von einem Supporter " "freigeschaltet werden (double-opt-in)." #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:69 From 6ad204d8e285aa0c401966165b06648f1c51d854 Mon Sep 17 00:00:00 2001 From: leaneb Date: Sat, 26 Nov 2016 16:32:26 +0100 Subject: [PATCH 3/6] Delete vcs.xml --- .idea/vcs.xml | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 .idea/vcs.xml diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7f..00000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file From 10517213f6b6391721af36ccf99c3d0db8762966 Mon Sep 17 00:00:00 2001 From: Leandra Eberle Date: Sat, 26 Nov 2016 16:33:07 +0100 Subject: [PATCH 4/6] Update Descriptions --- includes/view/AngelTypes_view.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/view/AngelTypes_view.php b/includes/view/AngelTypes_view.php index 318cd075..0c8a4068 100644 --- a/includes/view/AngelTypes_view.php +++ b/includes/view/AngelTypes_view.php @@ -65,7 +65,7 @@ function AngelType_edit_view($angeltype, $supporter_mode) { $supporter_mode ? form_info(_("Name"), $angeltype['name']) : form_text('name', _("Name"), $angeltype['name']), $supporter_mode ? form_info(_("Restricted"), $angeltype['restricted'] ? _("Yes") : _("No")) : form_checkbox('restricted', _("Restricted"), $angeltype['restricted']), $supporter_mode ? form_info(_("Requires driver license"), $angeltype['requires_driver_license'] ? _("Yes") : _("No")) : form_checkbox('requires_driver_license', _("Requires driver license"), $angeltype['requires_driver_license']), - form_info("", _("Restricted angel types can only be used by an angel if enabled by a supprter (double opt-in).")), + form_info("", _("Restricted angel types can only be used by an angel if enabled by a supporter (double opt-in).")), form_textarea('description', _("Description"), $angeltype['description']), form_info("", _("Please use markdown for the description.")), form_submit('submit', _("Save")) From acbaaf4364ea03620397938cd05835d694b7ff78 Mon Sep 17 00:00:00 2001 From: Leandra Eberle Date: Sat, 26 Nov 2016 16:43:22 +0100 Subject: [PATCH 5/6] Update Descriptions --- includes/view/AngelTypes_view.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/view/AngelTypes_view.php b/includes/view/AngelTypes_view.php index 0c8a4068..270a423e 100644 --- a/includes/view/AngelTypes_view.php +++ b/includes/view/AngelTypes_view.php @@ -65,7 +65,7 @@ function AngelType_edit_view($angeltype, $supporter_mode) { $supporter_mode ? form_info(_("Name"), $angeltype['name']) : form_text('name', _("Name"), $angeltype['name']), $supporter_mode ? form_info(_("Restricted"), $angeltype['restricted'] ? _("Yes") : _("No")) : form_checkbox('restricted', _("Restricted"), $angeltype['restricted']), $supporter_mode ? form_info(_("Requires driver license"), $angeltype['requires_driver_license'] ? _("Yes") : _("No")) : form_checkbox('requires_driver_license', _("Requires driver license"), $angeltype['requires_driver_license']), - form_info("", _("Restricted angel types can only be used by an angel if enabled by a supporter (double opt-in).")), + form_info("", _("Restricted angel types can only be used by an angel if enabled by a sup1porter (double opt-in).")), form_textarea('description', _("Description"), $angeltype['description']), form_info("", _("Please use markdown for the description.")), form_submit('submit', _("Save")) From 687c3333224c6b8db7e5868f120871d6174d39b5 Mon Sep 17 00:00:00 2001 From: Leandra Eberle Date: Sat, 26 Nov 2016 16:44:28 +0100 Subject: [PATCH 6/6] Update Descriptions --- includes/view/AngelTypes_view.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/view/AngelTypes_view.php b/includes/view/AngelTypes_view.php index 270a423e..0c8a4068 100644 --- a/includes/view/AngelTypes_view.php +++ b/includes/view/AngelTypes_view.php @@ -65,7 +65,7 @@ function AngelType_edit_view($angeltype, $supporter_mode) { $supporter_mode ? form_info(_("Name"), $angeltype['name']) : form_text('name', _("Name"), $angeltype['name']), $supporter_mode ? form_info(_("Restricted"), $angeltype['restricted'] ? _("Yes") : _("No")) : form_checkbox('restricted', _("Restricted"), $angeltype['restricted']), $supporter_mode ? form_info(_("Requires driver license"), $angeltype['requires_driver_license'] ? _("Yes") : _("No")) : form_checkbox('requires_driver_license', _("Requires driver license"), $angeltype['requires_driver_license']), - form_info("", _("Restricted angel types can only be used by an angel if enabled by a sup1porter (double opt-in).")), + form_info("", _("Restricted angel types can only be used by an angel if enabled by a supporter (double opt-in).")), form_textarea('description', _("Description"), $angeltype['description']), form_info("", _("Please use markdown for the description.")), form_submit('submit', _("Save"))