Merge branch 'master' into locale-2.8.3-fr

ChurchCRM · Jul 4, 2017 · 41e98ad · 41e98ad
2 parents e8393a6 + 001eacb
commit 41e98ad
Show file tree

Hide file tree

Showing 9 changed files with 451 additions and 6 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -25,7 +25,8 @@ module.exports = function (grunt) {
             'sv': 'sv_SE',
             'vi': 'vi_VN',
             'zh-CN': 'zh_CN',
-            'zh-TW': 'zh_TW'
+            'zh-TW': 'zh_TW',
+            'en-US': 'en_US'
         },
         projectFiles: [
             '**',

diff --git a/src/ChurchCRM/dto/SystemConfig.php b/src/ChurchCRM/dto/SystemConfig.php
@@ -198,11 +198,11 @@ private static function buildConfigs()
         "bDisplayBillCounts" => new ConfigItem(2002, "bDisplayBillCounts", "boolean", "1", gettext("Display bill counts on deposit slip")),
         "sCloudURL" => new ConfigItem(2003, "sCloudURL", "text", "http://demo.churchcrm.io/", gettext("ChurchCRM Cloud Access URL")),
         "sNexmoAPIKey" => new ConfigItem(2012, "sNexmoAPIKey", "text", "", gettext("Nexmo SMS API Key")),
-        "sNexmoAPISecret" => new ConfigItem(2005, "sNexmoAPISecret", "text", "", gettext("Nexmo SMS API Secret")),
+        "sNexmoAPISecret" => new ConfigItem(2005, "sNexmoAPISecret", "password", "", gettext("Nexmo SMS API Secret")),
         "sNexmoFromNumber" => new ConfigItem(2006, "sNexmoFromNumber", "text", "", gettext("Nexmo SMS From Number")),
         "sOLPURL" => new ConfigItem(2007, "sOLPURL", "text", "http://192.168.1.1:4316", gettext("OpenLP URL")),
         "sOLPUserName" => new ConfigItem(2008, "sOLPUserName", "text", "", gettext("OpenLP Username")),
-        "sOLPPassword" => new ConfigItem(2009, "sOLPPassword", "text", "", gettext("OpenLP Password")),
+        "sOLPPassword" => new ConfigItem(2009, "sOLPPassword", "password", "", gettext("OpenLP Password")),
         "sKioskVisibilityTimestamp" => new ConfigItem(2011, "sKioskVisibilityTimestamp", "text", "", gettext("KioskVisibilityTimestamp")),
         "bEnableLostPassword" => new ConfigItem(2004, "bEnableLostPassword", "boolean", "1", gettext("Show/Hide Lost Password Link on the login screen"))
       );

diff --git a/src/locale/en_US/LC_MESSAGES/messages.js b/src/locale/en_US/LC_MESSAGES/messages.js
diff --git a/src/locale/en_US/LC_MESSAGES/messages.mo b/src/locale/en_US/LC_MESSAGES/messages.mo
diff --git a/src/locale/en_US/LC_MESSAGES/messages.po b/src/locale/en_US/LC_MESSAGES/messages.po
diff --git a/src/locale/fr_FR/LC_MESSAGES/messages.js b/src/locale/fr_FR/LC_MESSAGES/messages.js
@@ -1316,7 +1316,7 @@
     "Estimated value": "Valeur estimée",
     "Disable Group Specific Properties": "Désactiver les propriétés spécifiques de groupe",
     "'Default Option'": "'Option par D&eacute;faut'",
-    "Text Group": "Groupe Texte",
+    "Text Group": "Texto au groupe",
     "Group Properties": "Propriétés Groupes",
     "Assign a New Property:": "Assigner une Nouvelle Propriété:",
     "mos old": "agé de ...",

diff --git a/src/locale/fr_FR/LC_MESSAGES/messages.mo b/src/locale/fr_FR/LC_MESSAGES/messages.mo
diff --git a/src/locale/fr_FR/LC_MESSAGES/messages.po b/src/locale/fr_FR/LC_MESSAGES/messages.po
@@ -5902,7 +5902,7 @@ msgstr "'Option par D&eacute;faut'"
 
 #: GroupView.php:248
 msgid "Text Group"
-msgstr "Groupe Texte"
+msgstr "Texto au groupe"
 
 #: GroupView.php:291 Include/Footer.php:108
 msgid "Group Properties"

diff --git a/src/locale/pt_BR/LC_MESSAGES/messages.js b/src/locale/pt_BR/LC_MESSAGES/messages.js