summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormsquare <msquare@notrademark.de>2016-11-26 20:05:00 +0100
committerGitHub <noreply@github.com>2016-11-26 20:05:00 +0100
commit53e12065c76af4e5a0a2690e92e6724eed9f2895 (patch)
tree0503f72fcdca5d814015556e72231069d9e79714
parent561e8ec36c50b2ace9fe7352dfb4e11f57d0e82e (diff)
parent687c3333224c6b8db7e5868f120871d6174d39b5 (diff)
Merge pull request #283 from leaneb/master
Change Descriptions
-rw-r--r--includes/view/AngelTypes_view.php2
-rw-r--r--locale/de_DE.UTF-8/LC_MESSAGES/default.po10
2 files changed, 6 insertions, 6 deletions
diff --git a/includes/view/AngelTypes_view.php b/includes/view/AngelTypes_view.php
index 04c0e286..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 an archangel (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"))
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