From 3a0cfdce1d51551f1127b33e58949ed210698ec6 Mon Sep 17 00:00:00 2001
From: Charles
Date: Sat, 15 Jul 2017 11:43:04 -0400
Subject: [PATCH] Build/2.8.5 to develop (#2838)
* kiosk cleanup
* cleanups
* fixes
* tweaks
* don't show new button yet since it's not connected.
* tweak
* Apply fixes from StyleCI
* styleci
* cleanup crmjsom for kiosks namespace
* cleanup kiosk manager assignments
* stopping for hte night
* kiosk manager works now.
* switching kiosk roles works now.
* Merge pull request #2541 from Adnan0703/highlight-selected-datatable-row
Highlight selected dataTable rows
* 2.8.0 text
* download 2.8.0 from poeditor pre 2.8.0 RC0
* fix SQL errors, and get sql version on bug report
* underp system service
* Apply fixes from StyleCI
* Bug/kiosk loop (#2597)
* tweaks
* kiosk tweaks
* Apply fixes from StyleCI
* merging all 2.8.0 sql
fixes #2590
* added php 7.1 and 5.6
part of #2348
* only deploy for php 7
* no 5.6 for now
* Explicitly test on Linux
* underp space
* underp space
* temp fix create family
* Don't show error if the jqXHR was aborted. (#2610)
* initial refactor
* Better Filter Methods
* line endings
* Apply fixes from StyleCI
* StyleCI manual patch apply
* add tests
* Standardize on display of FamilyString to disambiguate famililes (#2564)
* sort of works, but it's ugly. don't merge yet.
* should work, but doesnt.
* fix depositslipeditor
* fixing family search in pledges
* fix search
* cleanup
* fixed bHideFriendDate not taken effect (#2614)
* use SystemConfig::getValue
* using getBooleanValue
* 2.8.0 rc2 locale (#2619)
* chmod +x on scripts
* gen file before RC2
* pre-2.8.0 RC2 download
* closes #2472 (#2620)
* added missing use SystemConfig;
* Apply fixes from StyleCI (#2633)
* closes #2634
* fix group datatables
* fix multi select issue
* email debug
* Apply fixes from StyleCI (#2646)
* move docs to wiki (#2641)
* password types were getting the value of the last setting (#2644)
* fix openlp notifications and event loop performance
* remove debug
* Build/2.8.1 starting (#2658)
* move docs to wiki
* add missing 2.8.1
* fixed type setting (#2649)
fixed type setting, will always set even if it is unknown... and fixed verifyFamily type name
* checking for null (#2653)
* Update composer.json (#2631)
upgrading to the latest version which supports php 5.6 please do note that 4.x of the willdurand/geocoder lib does not support 5.6
* starting 2.8.2
* fixed db upgrades
* Fixed RootPath . /
* added admin user check
* Apply fixes from StyleCI
* uncomment family lat/long update
* after 2.8.1
* updated locale file
* updated from po-editor 2.8.0
* start 2.8.3 (#2676)
* locale-cleanup
parts of #2684
* Apply fixes from StyleCI (#2685)
* month view only show current month events
from #2625
* Apply fixes from StyleCI (#2689)
* Fix Datatable settings
created a common JS datatable settings for all standard datatables to use..
fixed dataTable to DataTable
* Revert "Fix Datatable settings"
This reverts commit 291bf93ed2fac743dc02228c448f3eb1bd6c8f69.
* fixed the download
* updated text
* added en_US
* Apply fixes from StyleCI (#2691)
* hide other month
* sOLPPassword, sNexmoAPISecret does not use Password config type (#2687)
fixes #2674
* remvoed FamilyWorkPhoneTask
* remvoed FamilyWorkPhoneTask (#2699)
* added box-tools
collapse & remove
* Fix DataTable settings (#2693)
* Fix Datatable settings
created a common JS datatable settings for all standard datatables to use..
fixed dataTable to DataTable
* Apply fixes from StyleCI (#2692)
* fixed root issue
* Update Header-function.php
updated locale
* Changes this ![image](https://user-images.githubusercontent.com/11679900/27839664-09ace14e-60c1-11e7-976b-51e46b9f648d.png)
to this:
![image](https://user-images.githubusercontent.com/11679900/27839671-12c08812-60c1-11e7-8ca1-9ecaface2a4f.png)
* moving datatable urls to windows.CRM values
this way it is a single change
* Apply fixes from StyleCI (#2698)
* using locale not lang code
* fixed JS error
* Update CartView.php
* Self Verify Changes v2 (#2702)
* hide fields if empty
* fixed group display
* visit our site now going to new sChurchWebSite value
* added Self Verification to timeline
* now shows M next any age less than 1 year (#2704)
* Update Footer.js
* Starting 2.8.4 (#2713)
* starting 2.8.4
* new message after 2.8.3
* 2.8.4 started...
download from poeditor after .3 was released
* Move docs links to wiki (#2688)
* moving docs/help to wiki
single spot for the URL to be stored and using Statis SystemURls
* updated chat and docs urls
* Update Functions.php (#2730)
* Update InputUtils.php (#2737)
Bug correction for many part :
- person property
- group property
* Update Functions.php
Update custom phone number for person
* Update GeoPage.php
Problem with strtolower with UTF8 charset
* Update GeoPage.php
Removed getext
* Apply fixes from StyleCI (#2744)
* remove old code
* translate group editor
* update translations
* fix footer.js
* mixxing PHP
* Update Footer.php (#2731)
* extract i18next.t strings from JS files
* revert derp locale
* revert derp locale
* revert derp locale
* fix duplicate keys with msgcat
* add i18n to JS string literals
* Fix Select2 Translation, Grunt Locale Concat task (#2746)
* Update Footer.php
* Apply fixes from StyleCI (#2745)
* cleanup short locale
* move shortLocale to CRM namespace var
* include select2 in concatenated locale. Closes #2763
* moved fullcalendar to min ver
* removed fullcalendar include
it is now in the footer
and ensure we are waiting for all JS to be ready
* added missing datatable language
* added missing sv select2
* Add i18next function calls to JS string literals (#2766)
* translate group editor
* update translations
* fix footer.js
* mixxing PHP
* extract i18next.t strings from JS files
* revert derp locale
* revert derp locale
* revert derp locale
* fix duplicate keys with msgcat
* add i18n to JS string literals
* added missing datatable language
* using window.CRM.plugin.dataTable (#2762)
* added missing split from 2.7.0
* update versions (#2779)
* updated Query to Look for People WIth Families
and ignore Admin
* ignore admin gender
* ignore admin
* split the name column into a image column
this will move the Group Export: Name has extra "  " ito its own column
* fixed no address member display (#2788)
* fixed no address memeber display
* Apply fixes from StyleCI (#2787)
* added missing Criteria use
* Update MemberView.js (#2802)
* Update MemberView.js
The js code could not work, the code is in PersonView.php is :
= gettext("Delete this Record") ?>
It's an id so the code should be : #delete-person and not : .delete-person
* using Id for Delete Person buttons
* fix sass version
* Update GeoPage.php (#2827)
Little update to be compatible with the translation of the unit Kilometers.
* move JSONKeys. concatenat JSON strings to locale js. Re-order i18next / footer.js
* update strings.
* cleanup JS translations
* update 2.8.5 tag from POEditor
---
.travis.yml | 2 +-
Gruntfile.js | 142 +-
.../messages.js => locale/JSONKeys/de_DE.json | 0
.../messages.js => locale/JSONKeys/en_AU.json | 0
.../messages.js => locale/JSONKeys/en_CA.json | 0
.../messages.js => locale/JSONKeys/en_GB.json | 0
locale/JSONKeys/en_US.json | 0
.../messages.js => locale/JSONKeys/es_ES.json | 23 +-
.../messages.js => locale/JSONKeys/fr_FR.json | 389 +++--
.../messages.js => locale/JSONKeys/hu_HU.json | 0
.../messages.js => locale/JSONKeys/it_IT.json | 0
.../messages.js => locale/JSONKeys/nb_NO.json | 0
.../messages.js => locale/JSONKeys/nl_NL.json | 0
.../messages.js => locale/JSONKeys/pl_PL.json | 0
.../messages.js => locale/JSONKeys/pt_BR.json | 458 +++++-
.../messages.js => locale/JSONKeys/ro_RO.json | 0
.../messages.js => locale/JSONKeys/ru_RU.json | 0
.../messages.js => locale/JSONKeys/sq_AL.json | 0
.../messages.js => locale/JSONKeys/sv_SE.json | 0
.../messages.js => locale/JSONKeys/vi_VN.json | 5 +-
.../messages.js => locale/JSONKeys/zh_CN.json | 0
.../messages.js => locale/JSONKeys/zh_TW.json | 0
locale/messages.po | 1222 ++++++++++++++-
locale/update-locale.sh | 3 +
package.json | 2 +-
src/AutoPaymentEditor.php | 1329 ++++++++++-------
src/CartView.php | 585 ++++----
src/CheckVersion.php | 3 +-
src/Checkin.php | 10 +-
src/ChurchCRM/Service/TaskService.php | 2 -
src/ChurchCRM/Service/TimelineService.php | 2 +
src/ChurchCRM/dto/ChurchMetaData.php | 5 +
src/ChurchCRM/dto/LocaleInfo.php | 5 +
src/ChurchCRM/dto/SystemConfig.php | 9 +-
src/ChurchCRM/dto/SystemURLs.php | 6 +
src/ChurchCRM/model/ChurchCRM/Person.php | 4 +-
src/ChurchCRM/tasks/FamilyWorkPhoneTask.php | 38 -
src/ChurchCRM/tasks/HttpsTask.php | 3 +-
.../tasks/PersonClassificationDataCheck.php | 7 +-
src/ChurchCRM/tasks/PersonGenderDataCheck.php | 7 +-
src/ChurchCRM/tasks/PersonRoleDataCheck.php | 7 +-
src/ChurchCRM/utils/InputUtils.php | 8 +-
src/EventNames.php | 11 +-
src/FamilyCustomFieldsEditor.php | 3 +-
src/FamilyList.php | 11 +-
src/FamilyView.php | 396 ++---
src/GeoPage.php | 2 +-
src/GroupPropsFormEditor.php | 3 +-
src/Include/Footer.php | 7 +-
src/Include/Functions.php | 9 +-
src/Include/Header-function.php | 47 +-
src/Include/Header.php | 2 +-
src/KioskManager.php | 2 +-
src/ListEvents.php | 11 +-
src/Login.php | 28 +-
src/Menu.php | 12 +
src/PersonCustomFieldsEditor.php | 3 +-
src/PersonView.php | 24 +-
src/PledgeEditor.php | 9 +-
src/UserList.php | 43 +-
src/calendar.php | 78 +-
src/composer.json | 4 +-
src/email/Dashboard.php | 4 +-
.../templates/verify/verify-family-info.php | 30 +-
src/locale/de_DE/LC_MESSAGES/messages.po | 484 +++++-
src/locale/en_AU/LC_MESSAGES/messages.po | 4 +
src/locale/en_CA/LC_MESSAGES/messages.po | 8 +
src/locale/en_GB/LC_MESSAGES/messages.po | 8 +
src/locale/en_US/LC_MESSAGES/messages.mo | 0
src/locale/en_US/LC_MESSAGES/messages.po | 0
src/locale/es_ES/LC_MESSAGES/messages.po | 889 ++++++++++-
src/locale/fr_FR/LC_MESSAGES/messages.po | 1251 +++++++++++++---
src/locale/hu_HU/LC_MESSAGES/messages.po | 473 +++++-
src/locale/it_IT/LC_MESSAGES/messages.po | 484 +++++-
src/locale/nb_NO/LC_MESSAGES/messages.po | 480 +++++-
src/locale/nl_NL/LC_MESSAGES/messages.po | 492 +++++-
src/locale/pl_PL/LC_MESSAGES/messages.po | 484 +++++-
src/locale/pt_BR/LC_MESSAGES/messages.po | 874 ++++++++++-
src/locale/ro_RO/LC_MESSAGES/messages.po | 480 +++++-
src/locale/ru_RU/LC_MESSAGES/messages.po | 480 +++++-
src/locale/sq_AL/LC_MESSAGES/messages.po | 496 +++++-
src/locale/sv_SE/LC_MESSAGES/messages.po | 484 +++++-
src/locale/vi_VN/LC_MESSAGES/messages.po | 422 ++++++
src/locale/zh_CN/LC_MESSAGES/messages.po | 484 +++++-
src/locale/zh_TW/LC_MESSAGES/messages.po | 487 +++++-
src/mysql/upgrade.json | 9 +-
src/mysql/upgrade/rebuild_nav_menus.sql | 3 +-
src/skin/js/CRMJSOM.js | 28 +-
src/skin/js/DepositSlipEditor.js | 13 +-
src/skin/js/FamilyView.js | 13 +-
src/skin/js/FindDepositSlip.js | 14 +-
src/skin/js/Footer.js | 26 +-
src/skin/js/GroupEditor.js | 25 +-
src/skin/js/GroupList.js | 16 +-
src/skin/js/GroupView.js | 36 +-
src/skin/js/IssueReporter.js | 4 +-
src/skin/js/MemberView.js | 10 +-
src/skin/js/PersonView.js | 4 +-
src/skin/js/ShowAge.js | 2 +-
src/sundayschool/SundaySchoolClassView.php | 15 +-
src/sundayschool/SundaySchoolDashboard.php | 19 +-
vagrant/bootstrap.sh | 1 +
102 files changed, 12578 insertions(+), 1939 deletions(-)
rename src/locale/de_DE/LC_MESSAGES/messages.js => locale/JSONKeys/de_DE.json (100%)
rename src/locale/en_AU/LC_MESSAGES/messages.js => locale/JSONKeys/en_AU.json (100%)
rename src/locale/en_CA/LC_MESSAGES/messages.js => locale/JSONKeys/en_CA.json (100%)
rename src/locale/en_GB/LC_MESSAGES/messages.js => locale/JSONKeys/en_GB.json (100%)
create mode 100644 locale/JSONKeys/en_US.json
rename src/locale/es_ES/LC_MESSAGES/messages.js => locale/JSONKeys/es_ES.json (99%)
rename src/locale/fr_FR/LC_MESSAGES/messages.js => locale/JSONKeys/fr_FR.json (90%)
rename src/locale/hu_HU/LC_MESSAGES/messages.js => locale/JSONKeys/hu_HU.json (100%)
rename src/locale/it_IT/LC_MESSAGES/messages.js => locale/JSONKeys/it_IT.json (100%)
rename src/locale/nb_NO/LC_MESSAGES/messages.js => locale/JSONKeys/nb_NO.json (100%)
rename src/locale/nl_NL/LC_MESSAGES/messages.js => locale/JSONKeys/nl_NL.json (100%)
rename src/locale/pl_PL/LC_MESSAGES/messages.js => locale/JSONKeys/pl_PL.json (100%)
rename src/locale/pt_BR/LC_MESSAGES/messages.js => locale/JSONKeys/pt_BR.json (80%)
rename src/locale/ro_RO/LC_MESSAGES/messages.js => locale/JSONKeys/ro_RO.json (100%)
rename src/locale/ru_RU/LC_MESSAGES/messages.js => locale/JSONKeys/ru_RU.json (100%)
rename src/locale/sq_AL/LC_MESSAGES/messages.js => locale/JSONKeys/sq_AL.json (100%)
rename src/locale/sv_SE/LC_MESSAGES/messages.js => locale/JSONKeys/sv_SE.json (100%)
rename src/locale/vi_VN/LC_MESSAGES/messages.js => locale/JSONKeys/vi_VN.json (99%)
rename src/locale/zh_CN/LC_MESSAGES/messages.js => locale/JSONKeys/zh_CN.json (100%)
rename src/locale/zh_TW/LC_MESSAGES/messages.js => locale/JSONKeys/zh_TW.json (100%)
delete mode 100644 src/ChurchCRM/tasks/FamilyWorkPhoneTask.php
create mode 100644 src/locale/en_US/LC_MESSAGES/messages.mo
create mode 100644 src/locale/en_US/LC_MESSAGES/messages.po
diff --git a/.travis.yml b/.travis.yml
index 50cfb06de4..d9bbf4a696 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,7 +30,7 @@ env:
before_install:
- sudo apt-get update
- sudo apt-get install ruby-full
- - sudo gem install sass
+ - sudo gem install sass -v 3.4.25
- chmod +x ./travis-ci/*.sh
- chmod +x ./scripts/*.sh
- cp BuildConfig.json.example BuildConfig.json
diff --git a/Gruntfile.js b/Gruntfile.js
index 4b5aef687d..37fd8c2adb 100644
--- 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: [
'**',
@@ -163,22 +164,43 @@ module.exports = function (grunt) {
concat: {
options: {
separator: ';\n\n',
- banner: '/*! <%= package.version %> <%= grunt.template.today("dd-mm-yyyy") %> */\n'
+ banner: '/*! <%= package.version %> <%= grunt.template.today("dd-mm-yyyy") %> */\n',
+ process: function(src, filepath) {
+ if (filepath.match(/JSONKeys/)){
+ src = "window.CRM.i18keys = " + src + ";";
+ }
+ return '// Source: ' + filepath + '\n' +
+ "try {"+src+"} catch(e) {}";
+ },
},
de_DE: {
- src: ['node_modules/fullcalendar/dist/locale/de.js', 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.de.js'],
+ src: [
+ 'locale/JSONKeys/de_DE.json',
+ 'node_modules/fullcalendar/dist/locale/de.js',
+ 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.de.js',
+ 'node_modules/admin-lte/plugins/select2/i18n/de.js'
+ ],
dest: 'src/skin/locale/de_DE.js'
},
en_AU: {
- src: ['node_modules/fullcalendar/dist/locale/en-au.js'],
+ src: [
+ 'locale/JSONKeys/en_AU.json',
+ 'node_modules/fullcalendar/dist/locale/en-au.js'
+ ],
dest: 'src/skin/locale/en_AU.js'
},
en_CA: {
- src: ['node_modules/fullcalendar/dist/locale/en-ca.js'],
+ src: [
+ 'locale/JSONKeys/en_CA.json',
+ 'node_modules/fullcalendar/dist/locale/en-ca.js'
+ ],
dest: 'src/skin/locale/en_CA.js'
},
en_GB: {
- src: ['node_modules/fullcalendar/dist/locale/en-gb.js'],
+ src: [
+ 'locale/JSONKeys/en_GB.json',
+ 'node_modules/fullcalendar/dist/locale/en-gb.js'
+ ],
dest: 'src/skin/locale/en_GB.js'
},
en_US: {
@@ -186,63 +208,136 @@ module.exports = function (grunt) {
dest: 'src/skin/locale/en_US.js'
},
es_ES: {
- src: ['node_modules/fullcalendar/dist/locale/es.js', 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.es.js'],
+ src: [
+ 'locale/JSONKeys/es_ES.json',
+ 'node_modules/fullcalendar/dist/locale/es.js',
+ 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.es.js',
+ 'node_modules/admin-lte/plugins/select2/i18n/es.js'
+ ],
dest: 'src/skin/locale/es_ES.js'
},
fr_FR: {
- src: ['node_modules/fullcalendar/dist/locale/fr.js', 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.fr.js'],
+ src: [
+ 'locale/JSONKeys/fr_FR.json',
+ 'node_modules/fullcalendar/dist/locale/fr.js',
+ 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.fr.js',
+ 'node_modules/admin-lte/plugins/select2/i18n/fr.js'
+ ],
dest: 'src/skin/locale/fr_FR.js'
},
hu_HU: {
- src: ['node_modules/fullcalendar/dist/locale/hu.js', 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.hu.js'],
+ src: [
+ 'locale/JSONKeys/hu_HU.json',
+ 'node_modules/fullcalendar/dist/locale/hu.js',
+ 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.hu.js',
+ 'node_modules/admin-lte/plugins/select2/i18n/hu.js'
+ ],
dest: 'src/skin/locale/hu_HU.js'
},
it_IT: {
- src: ['node_modules/fullcalendar/dist/locale/it.js', 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.it.js'],
+ src: [
+ 'locale/JSONKeys/it_IT.json',
+ 'node_modules/fullcalendar/dist/locale/it.js',
+ 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.it.js',
+ 'node_modules/admin-lte/plugins/select2/i18n/it.js'
+ ],
dest: 'src/skin/locale/it_IT.js'
},
nb_NO: {
- src: ['node_modules/fullcalendar/dist/locale/nb.js', 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.nb.js'],
+ src: [
+ 'locale/JSONKeys/nb_NO.json',
+ 'node_modules/fullcalendar/dist/locale/nb.js',
+ 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.nb.js',
+ 'node_modules/admin-lte/plugins/select2/i18n/nb.js'
+ ],
dest: 'src/skin/locale/nb_NO.js'
},
nl_NL: {
- src: ['node_modules/fullcalendar/dist/locale/nl.js', 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.nl.js'],
+ src: [
+ 'locale/JSONKeys/nl_NL.json',
+ 'node_modules/fullcalendar/dist/locale/nl.js',
+ 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.nl.js',
+ 'node_modules/admin-lte/plugins/select2/i18n/nl.js'
+ ],
dest: 'src/skin/locale/nl_NL.js'
},
pl_PL: {
- src: ['node_modules/fullcalendar/dist/locale/pl.js', 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.pl.js'],
+ src: [
+ 'locale/JSONKeys/pl_PL.json',
+ 'node_modules/fullcalendar/dist/locale/pl.js',
+ 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.pl.js',
+ 'node_modules/admin-lte/plugins/select2/i18n/pl.js'
+ ],
dest: 'src/skin/locale/pl_PL.js'
},
pt_BR: {
- src: ['node_modules/fullcalendar/dist/locale/pt-br.js', 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.pt-BR.js'],
+ src: [
+ 'locale/JSONKeys/pt_BR.json',
+ 'node_modules/fullcalendar/dist/locale/pt-br.js',
+ 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.pt-BR.js',
+ 'node_modules/admin-lte/plugins/select2/i18n/pt-BR.js'
+ ],
dest: 'src/skin/locale/pt_BR.js'
},
ro_RO: {
- src: ['node_modules/fullcalendar/dist/locale/ro.js', 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.ro.js'],
+ src: [
+ 'locale/JSONKeys/ro_RO.json',
+ 'node_modules/fullcalendar/dist/locale/ro.js',
+ 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.ro.js',
+ 'node_modules/admin-lte/plugins/select2/i18n/ro.js'
+ ],
dest: 'src/skin/locale/ro_RO.js'
},
ru_RU: {
- src: ['node_modules/fullcalendar/dist/locale/ru.js', 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.ru.js'],
+ src: [
+ 'locale/JSONKeys/ru_RU.json',
+ 'node_modules/fullcalendar/dist/locale/ru.js',
+ 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.ru.js',
+ 'node_modules/admin-lte/plugins/select2/i18n/ru.js'
+ ],
dest: 'src/skin/locale/ru_RU.js'
},
sq_AL: {
- src: ['node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.sq.js'],
+ src: [
+ 'locale/JSONKeys/sq_AL.json',
+ 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.sq.js'
+ ],
dest: 'src/skin/locale/sq_AL.js'
},
sv_SE: {
- src: ['node_modules/fullcalendar/dist/locale/sv.js', 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.sv.js'],
+ src: [
+ 'locale/JSONKeys/sv_SE.json',
+ 'node_modules/fullcalendar/dist/locale/sv.js',
+ 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.sv.js',
+ 'node_modules/admin-lte/plugins/select2/i18n/sv.js'
+ ],
dest: 'src/skin/locale/sv_SE.js'
},
vi_VN: {
- src: ['node_modules/fullcalendar/dist/locale/vi.js', 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.vi.js'],
+ src: [
+ 'locale/JSONKeys/vi_VN',
+ 'node_modules/fullcalendar/dist/locale/vi.js',
+ 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.vi.js',
+ 'node_modules/admin-lte/plugins/select2/i18n/vi.js'
+ ],
dest: 'src/skin/locale/vi_VN.js'
},
zh_CN: {
- src: ['node_modules/fullcalendar/dist/locale/zh-cn.js', 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.zh-CN.js'],
+ src: [
+ 'locale/JSONKeys/zh_CN.json',
+ 'node_modules/fullcalendar/dist/locale/zh-cn.js',
+ 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.zh-CN.js',
+ 'node_modules/admin-lte/plugins/select2/i18n/zh-CN.js'
+ ],
dest: 'src/skin/locale/zh_CN.js'
},
zh_TW: {
- src: ['node_modules/fullcalendar/dist/locale/zh-tw.js', 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.zh-TW.js'],
+ src: [
+ 'locale/JSONKeys/zh_TW.json',
+ 'node_modules/fullcalendar/dist/locale/zh-tw.js',
+ 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.zh-TW.js',
+ 'node_modules/admin-lte/plugins/select2/i18n/zh-TW.js'
+ ],
dest: 'src/skin/locale/zh_TW.js'
}
},
@@ -406,7 +501,7 @@ module.exports = function (grunt) {
filters: ["translated"],
tags: '<%= package.version %>',
type: 'key_value_json', // export type (check out the doc)
- dest: 'src/locale/?/LC_MESSAGES/messages.js'
+ dest: 'locale/JSONKeys/?.json'
// grunt style dest files
}
},
@@ -451,7 +546,7 @@ module.exports = function (grunt) {
});
grunt.registerTask('updateFromPOeditor', 'Description of the task', function (target) {
- grunt.config('clean', {pofiles: ["src/locale/*/**/*.po", "src/locale/*/**/*.mo", "src/locale/*/**/*.js"]});
+ grunt.config('clean', {pofiles: ["src/locale/*/**/*.po", "src/locale/*/**/*.mo", "locale/JSONKeys/*.json"]});
grunt.task.run(['clean:pofiles']);
grunt.loadNpmTasks('grunt-poeditor-ab');
grunt.task.run(['poeditor']);
@@ -493,4 +588,5 @@ module.exports = function (grunt) {
grunt.loadNpmTasks('grunt-contrib-compress');
grunt.loadNpmTasks('grunt-contrib-rename');
grunt.loadNpmTasks('grunt-curl');
+ grunt.loadNpmTasks('grunt-poeditor-ab');
}
diff --git a/src/locale/de_DE/LC_MESSAGES/messages.js b/locale/JSONKeys/de_DE.json
similarity index 100%
rename from src/locale/de_DE/LC_MESSAGES/messages.js
rename to locale/JSONKeys/de_DE.json
diff --git a/src/locale/en_AU/LC_MESSAGES/messages.js b/locale/JSONKeys/en_AU.json
similarity index 100%
rename from src/locale/en_AU/LC_MESSAGES/messages.js
rename to locale/JSONKeys/en_AU.json
diff --git a/src/locale/en_CA/LC_MESSAGES/messages.js b/locale/JSONKeys/en_CA.json
similarity index 100%
rename from src/locale/en_CA/LC_MESSAGES/messages.js
rename to locale/JSONKeys/en_CA.json
diff --git a/src/locale/en_GB/LC_MESSAGES/messages.js b/locale/JSONKeys/en_GB.json
similarity index 100%
rename from src/locale/en_GB/LC_MESSAGES/messages.js
rename to locale/JSONKeys/en_GB.json
diff --git a/locale/JSONKeys/en_US.json b/locale/JSONKeys/en_US.json
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/locale/es_ES/LC_MESSAGES/messages.js b/locale/JSONKeys/es_ES.json
similarity index 99%
rename from src/locale/es_ES/LC_MESSAGES/messages.js
rename to locale/JSONKeys/es_ES.json
index 781a961d57..f2690a0211 100644
--- a/src/locale/es_ES/LC_MESSAGES/messages.js
+++ b/locale/JSONKeys/es_ES.json
@@ -1848,7 +1848,6 @@
"Church Address is not Set.": "Dirección de Iglesia no ha sido Definida.",
"Church Name is set to default value": "Nombre de Iglesia está definido con valor por defecto",
"SMTP Server info are blank": "El campo de Servidor de SMTP, se encuentra en blanco.",
- "In Church CRM 2.6.0 we will no longer support a work phone for a family": "En Church CRM 2.6.0 no seguiremos soportando un teléfono de trabajo para una familia",
"Your system could be more secure by installing an TLS/SSL Cert.": "Su sistema podría ser más seguro instalando un Certificado TLS/SSL.",
"Missing Classification Data": "Datos de Clasificación Faltantes",
"Missing Classification Data for Some People": "Datos de Clasificación Faltantes para Algunas Personas",
@@ -1996,6 +1995,8 @@
"Action Confirmation": "Confirmación de Acción",
"Please confirm reset failed login count": "Por favor confirme restablecer la cuenta de ingresos fallidos",
"Password reset for": "Restablecer contraseña para",
+ "View Active Families": "Ver Familias Activas",
+ "View Inactive Families": "Ver Familias Inactivas",
"SMTP Server timeout in sec": "Tiempo de espera del Servidor SMTP en segundos",
"Exclude Inactive Families": "Excluir Familias Inactivas",
"The role is already assigned.": "El rol ya fue asignado.",
@@ -2027,6 +2028,13 @@
"CRITICAL": "CRÍTICO",
"ALERT": "ALERTA",
"EMERGENCY": "EMERGENCIA",
+ "Title FirstName MiddleName LastName": "Título PrimerNombre SegundoNombre Apellido",
+ "Title FirstName MiddleInitial. LastName": "Título Nombre InicialSegundoNombre Apellido",
+ "LastName, Title FirstName MiddleName": "Apellido, Título PrimerNombre SegundoNombre",
+ "LastName, Title FirstName MiddleInitial": "Apellido, Título PrimerNombre InicialSegundoNombre",
+ "FirstName MiddleName LastName": "PrimerNombre SegundoNombre Apellido",
+ "Title FirstName LastName": "Título PrimerNombre Apellido",
+ "LastName, Title FirstName": "Apellido, Titulo PrimerNombre",
"Event Log severity to write, used by ORM and App Logs": "Log de eventos de gravedad a escribir, usado por ORM y Logs de App",
"Time zone": "Zona horaria",
"Nexmo SMS API Key": "Llave de API Nexmo SMS",
@@ -2064,5 +2072,16 @@
"Enable New Kiosk Registration": "Activar Nuevo Registro de Quiosco",
"Active Kiosks": "Activar Quioscos",
"I forgot my password": "Olvidé mi contraseña",
- "Attendees Checked In": "Asistentes Registrados En"
+ "Attendees Checked In": "Asistentes Registrados En",
+ " family": " familia",
+ "Bank Draft ": "Giro Bancario ",
+ "Credit Card ": "Tarjeta de Crédito ",
+ "Disable ": "Desabilitar ",
+ "Store Private Data at Vanco": "Almacenar Datos Privados en Vanco",
+ "Cart Functions": "Funciones del Separador",
+ "Text Cart": "Separador de Texto",
+ "Your Church's Website": "Sitio Web de su Iglesia",
+ "Self Verification": "Autoverificación",
+ "Deactivate": "Desactivar",
+ "Activate": "Activar"
}
diff --git a/src/locale/fr_FR/LC_MESSAGES/messages.js b/locale/JSONKeys/fr_FR.json
similarity index 90%
rename from src/locale/fr_FR/LC_MESSAGES/messages.js
rename to locale/JSONKeys/fr_FR.json
index 2dff08aabd..55d683ad19 100644
--- a/src/locale/fr_FR/LC_MESSAGES/messages.js
+++ b/locale/JSONKeys/fr_FR.json
@@ -1,6 +1,6 @@
{
"Cannot execute query.": "Impossible d'exécuter la requête.",
- "Confirm Delete Automatic payment": "Confirmer suppression paiement automatique",
+ "Confirm Delete Automatic payment": "Confirmer suppression automatique de paiement",
"Delete": "Supprimer",
"Cancel": "Annuler",
"Automatic payment configuration for the ": "Configuration automatique du paiement pour le",
@@ -26,17 +26,17 @@
"Vanco Bank Account Method": "Méthode Vanco des comptes bancaires",
"Backup Database": "Sauvegarder la Base de Données",
"This tool will assist you in manually backing up the ChurchCRM database.": "Cet outil vous aidera à effectuer une sauvegarde manuelle de la base de données de ChurchCRM",
- "You should make a manual backup at least once a week unless you already have a regular backup procedule for your systems.": "Vous devriez faire une protection manuelle au moins une fois par semaine à moins que vous ayez déjà un procédure de sauvegarde réguliere pour vos systèmes.",
- "After you download the backup file, you should make two copies. Put one of them in a fire-proof safe on-site and the other in a safe location off-site.": "Après que vous téléchargiez le dossier de secours, vous devriez effectuer deux copies.Mettez-en une dans un emplacement sûr du site et l'autre dans un emplacement sûr à l'extérieur du site.",
+ "You should make a manual backup at least once a week unless you already have a regular backup procedule for your systems.": "Vous devriez faire une sauvegarde manuelle au moins une fois par semaine à moins que vous ayez déjà un procédure de sauvegarde réguliere pour vos systèmes.",
+ "After you download the backup file, you should make two copies. Put one of them in a fire-proof safe on-site and the other in a safe location off-site.": "Après que vous ayez téléchargé le fichier de sauvegarde, vous devriez effectuer deux copies. Mettez-en une dans un emplacement sûr du site et l'autre dans un emplacement sûr à l'extérieur du site.",
"If you are concerned about confidentiality of data stored in the ChurchCRM database, you should encrypt the backup data if it will be stored somewhere potentially accessible to others": "Si vous êtes concernés par la confidentialité des données enregistrées dans la base de données ChurchCRM, vous devriez crypter les données sauvegardées si elles sont stockées à un endroit accessible à d'autres personnes.",
- "For added backup security, you can e-mail the backup to yourself at an e-mail account hosted off-site or to a trusted friend. Be sure to use encryption if you do this, however.": "Pour ajouter une sauvegarde de sécurité, vous pouvez vous envoyer un Email ou l'envoyer à un ami de confiance. Cependant, soyez sûr d'employer l'encryptage si vous faites ceci.",
- "Select archive type": "Sélectionnez le type de sauvegarde",
+ "For added backup security, you can e-mail the backup to yourself at an e-mail account hosted off-site or to a trusted friend. Be sure to use encryption if you do this, however.": "Pour ajouter une sauvegarde de sécurité, vous pouvez vous envoyer un Email ou l'envoyer à un ami de confiance. Cependant, soyez sûr d'employer l'encryptage si vous faites ceci.",
+ "Select archive type": "Sélectionnez le type de sauvegarde",
"GZip": "Gzip",
- "Uncompressed": "Non compressé",
+ "Uncompressed": "Non compressé",
"tar.gz (Include Photos)": "tar.gz (inclure les photos)",
"Encrypt backup file with a password?": "Encrypter les fichiers de sauvegarde avec un mot de passe?",
"Re-type Password": "Retapez votre Mot de Passe",
- "Generate and Download Backup": "Générez ou Téléchargez Sauvegardes",
+ "Generate and Download Backup": "Générez ou Téléchargez Sauvegarde",
"Generate and Ship Backup to External Storage": "Générer et envoyer la sauvegarde vers une sauvegarde externe",
"Batch Winner Entry": "Traitez par lot Entrée de Gagnant",
"Winner": "Gagnant",
@@ -46,43 +46,43 @@
"Field Selection": "Sélection de champs",
"Last Name": "Nom",
"Required": "Requis",
- "First Name": "Prénom",
- "Middle Name": "Deuxième Prénom",
+ "First Name": "Prénom",
+ "Middle Name": "Deuxième Prénom",
"Zip": "Code postal",
"Envelope": "Enveloppe",
"Work/Other Email": "Email Travail / Autre",
- "Membership Date": "Date d'Adhésion",
+ "Membership Date": "Date d'Adhésion",
"Birth / Anniversary Date": "Date De Naissance / Anniversaire",
- "Age / Years Married": "Durée / Années de Mariage",
- "Family Role": "Rôle Famille",
- "Depends whether using person or family output method": "Dépend de la méthode de sortie choisie par l'utilisateur",
+ "Age / Years Married": "Durée / Années de Mariage",
+ "Family Role": "Rôle Famille",
+ "Depends whether using person or family output method": "Dépend de la méthode de sortie choisie par l'utilisateur",
"Custom Field Selection": "Sélection de champs personnalisés",
"Custom Person Fields": "Champs personnalisés des Membres",
- "Custom Family Fields": "Champs Personnalisés familiaux",
+ "Custom Family Fields": "Champs Personnalisés familiaux",
"Filters": "Filtres",
- "Records to export": "Enregistrements à exporter",
- "Based on filters below..": "Basé sur des filtres ci-dessous..",
- "People in Cart (filters ignored)": "Personnes dans le Panier (filtres ignorés)",
- "Use Ctrl Key to select multiple": "Utilisez la touche Ctrl pour une sélection multiple",
+ "Records to export": "Enregistrements à exporter",
+ "Based on filters below..": "Basé sur des filtres ci-dessous..",
+ "People in Cart (filters ignored)": "Personnes dans le Panier (filtres ignorés)",
+ "Use Ctrl Key to select multiple": "Utilisez la touche Ctrl pour une sélection multiple",
"Don't Filter": "Ne Pas Filtrer",
"Male": "Homme",
"Female": "Femme",
- "Group Membership": "Adhésion au Groupe",
+ "Group Membership": "Adhésion au Groupe",
"From:": "De:",
"To:": "A:",
"Birthday Date": "Date de Naissance",
"Anniversary Date": "Date d'Anniversaire",
- "Output Method:": "Méthode d'Exportation:",
+ "Output Method:": "Méthode d'Exportation:",
"CSV Individual Records": "Enregistrements individuels CSV",
- "CSV Combine Families": "Données Familles en CVS",
+ "CSV Combine Families": "Données Familles en CVS",
"Add Individuals to Cart": "Ajoutez des individus au panier",
- "Skip records with incomplete mail address": "Ignorer les enregistrements qui ont une adresse email incomplète ",
- "Create File": "Dossier créé",
- "No file selected for upload.": "Aucune photo n'a été sélectionné pour le téléchargement.",
+ "Skip records with incomplete mail address": "Ignorer les enregistrements qui ont une adresse email incomplète ",
+ "Create File": "Fichier créé",
+ "No file selected for upload.": "Aucune photo n'a été sélectionné pour le téléchargement.",
"Total number of rows in the CSV file:": "Nombre total de lignes dans le fichier CSV:",
"Ignore this Field": "Ignorez ce champ",
"Title": "Titre",
- "Suffix": "Suffixe:",
+ "Suffix": "Suffixe",
"Gender": "Sexe",
"Donation Envelope": "Enveloppe De Cotisation:",
"Home Phone": "Téléphone Fixe",
@@ -148,7 +148,7 @@
"Not Interested": "Non intéressé",
"Why Not Interested?": "Pourquoi ce désintégré ?",
"Add Cart to Event": "Ajouter l'événement au Panier",
- "Select the event to which you would like to add your cart": "Sésectionnez l'événement que vous voulez ajouter au panier",
+ "Select the event to which you would like to add your cart": "Sélectionner l'événement à ajouter au panier",
"OR": "OU",
"Add New Event": "Ajouter Nouvel événement",
"Your cart is empty!": "Votre panier est vide!",
@@ -165,11 +165,11 @@
"Do not auto-format": "Ne pas utiliser le format automatique",
"Add to Family": "Ajouter à la Famille",
"Add Cart to Group": "Ajouter le Panier au Groupe",
- "Select the group to which you would like to add your cart": "Sélectionnez le groupe que vous voulez ajouter au panier",
+ "Select the group to which you would like to add your cart": "Sélectionner le groupe que vous voulez ajouter au panier",
"Select Group": "Sélectionner le groupe",
"No Group Selected": "Aucun groupe sélectionné",
"Add to Group": "Ajoutez au groupe",
- "Create a New Group": "Créez un nouveau groupe",
+ "Create a New Group": "Créer un nouveau groupe",
"View Your Cart": "Voir votre panier",
"You have no items in your cart.": "Vous n'avez aucun item dans votre panier.",
"Back to Menu": "Revenir au menu",
@@ -182,7 +182,7 @@
"Name Tags": "Nom étiquettes",
"Email Cart": "Email le panier",
"Email (BCC)": "Mail (BCC)",
- "Create Directory From Cart": "Créer un annuaire depuis le panier",
+ "Create Directory From Cart": "Créer un annuaire depuis le panier",
"Generate Labels": "Générer des Etiquettes",
"Bulk Mail Presort": "Courrier en vrac pré-trié",
"Quiet Presort": "pré-Trier tranquillement",
@@ -215,7 +215,7 @@
"No Attendees Assigned to Event": "Pas de participant assigné à l'événement",
"Member": "Membre",
" of the": " de la",
- "(No assigned family)": "(Aucune Famille assignée)",
+ "(No assigned family)": "(Aucune Famille assignée)",
"Convert Individuals to Families": "Convertir les individus en famille",
"Convert Next": "Convertir suivant",
"Convert All": "Convertir chacun",
@@ -231,20 +231,20 @@
"Load Authorized Transactions": "Chargez les transactions autorisées",
"Run Transactions": "Démarrer les transactions",
"Directory reports": "Rapports annuaires",
- "Select classifications to include": "Choisissez les classifications à inclure",
- "Which role is the head of household?": "Quel est le Rôle du responsable ?",
- "Which role is the spouse?": "Quel est le Rôle du conjoint?",
- "Which role is a child?": "Quel Rôle de l'enfant?",
- "Information to Include": "Information à Inclure",
+ "Select classifications to include": "Choisissez les classifications à inclure",
+ "Which role is the head of household?": "Quel est le Rôle du responsable ?",
+ "Which role is the spouse?": "Quel est le Rôle du conjoint?",
+ "Which role is a child?": "Quel Rôle de l'enfant?",
+ "Information to Include": "Information à Inclure",
"Address": "Adresse",
"Birthday": "Anniversaire",
- "Family Home Phone": "Téléphone de la famille",
- "Family Work Phone": "Téléphone Professionnel de la famille",
- "Family Cell Phone": "Téléphone Portable de la famille",
+ "Family Home Phone": "Téléphone de la famille",
+ "Family Work Phone": "Téléphone Professionnel de la famille",
+ "Family Cell Phone": "Téléphone Portable de la famille",
"Family Email": "Email de la famille",
- "Personal Home Phone": "Téléphone Personnel",
- "Personal Work Phone": "Téléphone Personnel du travail",
- "Personal Cell Phone": "Téléphone Portable Personnel",
+ "Personal Home Phone": "Téléphone Personnel",
+ "Personal Work Phone": "Téléphone Personnel du travail",
+ "Personal Cell Phone": "Téléphone Portable Personnel",
"Personal Email": "Email Personnel",
"Personal Work/Other Email": "Email Personnel Travail/Autre:",
"Photos": "Photos",
@@ -255,7 +255,7 @@
"Use Title Page": "Utilisez Titre Page",
"Church Name": "Nom de l'église",
"Disclaimer": "Avertissement",
- "Create Directory": "Créer l'annuaire",
+ "Create Directory": "Créer l'annuaire",
"Donated Item Editor": "Éditeur des dons",
"Save and Add": "Enregistrer et Ajouter",
"Item": "Item",
@@ -269,10 +269,10 @@
"Description": "Description",
"Picture URL": "URL de l'image",
"Donation Fund Editor": "Gestionnaire de Cotisations par Associations",
- "Are you sure you want to delete this fund?": "Etes vous sûr de vouloir supprimer ce fond ?",
- "Warning: Field changes will be lost if you do not 'Save Changes' before using a delete or 'add new' button!": "Attention: Les champs modifiés seront perdus si vous ne 'Sauvez pas les Changements' avant d'utiliser les boutons supprimer ou 'ajouter nouveau !",
- "Invalid fields or selections. Changes not saved! Please correct and try again!": "Champs ou choix invalides. Changements non sauvés! Svp corrigez et essayez à nouveau !",
- "No funds have been added yet": "Aucune fonds n'a encore été ajoutée pour l'instant",
+ "Are you sure you want to delete this fund?": "Etes vous sûr de vouloir supprimer ce fond ?",
+ "Warning: Field changes will be lost if you do not 'Save Changes' before using a delete or 'add new' button!": "Attention: Les champs modifiés seront perdus si vous ne 'Sauvez pas les Changements' avant d'utiliser les boutons supprimer ou 'ajouter nouveau !",
+ "Invalid fields or selections. Changes not saved! Please correct and try again!": "Champs ou choix invalides. Changements non enregistrés ! Svp corrigez et essayez à nouveau !",
+ "No funds have been added yet": "Aucune fonds n'a encore été ajoutée pour l'instant",
"Active": "Actif",
"Save Changes": "Enregistrer les modifications",
"Add New Fund": "Ajouter Nouvelle Association",
@@ -289,7 +289,7 @@
"Add a New Electronic Payment Method": "Ajouter une nouvelle méthode de Paiment par internet",
"Family": "Familles",
"Type": "Type",
- "Fiscal Year": "Année Fiscale",
+ "Fiscal Year": "Année Fiscale",
"Next Date": "Prochaine Date",
"Amount": "Montant",
"Interval": "Intervalle",
@@ -299,7 +299,7 @@
"Account": "Compte",
"Vanco ACH": "Vanco ACH ",
"Month": "Mois",
- "Year": "Année",
+ "Year": "Année",
"Vanco CC": "Vanco CC ",
"Edit": "Editer",
"Message": "Message",
@@ -310,7 +310,7 @@
"There ": "Vous avez ",
"Event Title": "Titre de l'événement",
"Event Date": "Date de l'événement",
- "Generate Report": "Créer un Rapport",
+ "Generate Report": "Créer un Rapport",
"Attending Members": "Présence des membres",
"Non-Attending Members": "Absence des membres",
"Guests": "Invités",
@@ -320,7 +320,7 @@
"Create a new Event": "Créer un nouvelle événement",
"Editing Event ID: ": "Modification des ID d'événement:",
" errors. Please see below": "erreurs. Voir ci-dessous",
- "Items with a ": "Elémenti avec un :",
+ "Items with a ": "Eléments avec un :",
" are required": " sont requis",
"Select your event type": "Sélectionner votre type d'événement",
"You must pick an event type.": "Vous devez choisir un type d'événement.",
@@ -346,25 +346,25 @@
"Every event type includes a Total count, you do not need to include it.": "Chaque type d'événements inclus à nombre Total, vous ne devez pas l'inclure.",
"Add Event Type": "Ajouter Type d'événement",
"Custom Family Fields Editor": "Editeur de Champs Personnalisés pour les Familles",
- "Default Option": "Option par Défaut",
- "Warning: By deleting this field, you will irrevokably lose all family data assigned for this field!": "Attention: En supprimant ce champ, vous perdrez de fait toutes les données de personne assignées à ce champ!",
- "Warning: Arrow and delete buttons take effect immediately. Field name changes will be lost if you do not 'Save Changes' before using an up, down, delete or 'add new' button!": "Attention: Les champs modifiés seront perdus si vous ne 'Sauvez pas les Changements avant d'utiliser les boutons haut, bas, supprimer ou 'ajouter nouveau'",
- "No custom Family fields have been added yet": "Aucun champ personnalisé n'a encore été ajouté pour l'instant",
- "Special option": "Option Spéciale",
+ "Default Option": "Option par Défaut",
+ "Warning: By deleting this field, you will irrevokably lose all family data assigned for this field!": "Attention: En supprimant ce champ, vous perdrez de fait toutes les données de personne assignées à ce champ!",
+ "Warning: Arrow and delete buttons take effect immediately. Field name changes will be lost if you do not 'Save Changes' before using an up, down, delete or 'add new' button!": "Attention: Les champs modifiés seront perdus si vous ne 'Sauvez pas les Changements avant d'utiliser les boutons haut, bas, supprimer ou 'ajouter nouveau'",
+ "No custom Family fields have been added yet": "Aucun champ personnalisé n'a encore été ajouté pour l'instant",
+ "Special option": "Option Spéciale",
"Security Option": "Option de sécurité",
"Family-View Side": "Vue Famille latéral",
- "You must select a group.": "Vous devez sélectionner un groupe.",
+ "You must select a group.": "Vous devez sélectionner un groupe.",
"Edit List Options": "Editer la Liste des Options",
"Left": "Gauche",
"Right": "Droite",
"Help on types..": "Aide sur les types..",
"You must enter a name": "Vous devez entrer un nom",
- "That field name already exists.": "Ce nom de champ existe déjà.",
- "Side": "Côté",
+ "That field name already exists.": "Ce nom de champ existe déjà.",
+ "Side": "Côté",
"Add New Field": "Ajouter Nouveau Champ",
"Family Editor": "Editeur de Familles",
"First name must be entered": "Le prénom doit être saisi",
- "Invalid Year: allowable values are 1901 to 2155": "Année Invalide: les valeurs permises sont comprise entre 1901 et 2155",
+ "Invalid Year: allowable values are 1901 to 2155": "Année Invalide: les valeurs permises sont comprise entre 1901 et 2155",
"Invalid Birth Date.": "Date de Naissance Invalide.",
"Not a valid Wedding Date": "La Date de Mariage n'est pas valide",
"Email is Not Valid": "E-mail n'est pas valide",
@@ -373,32 +373,32 @@
"Contact Info": "Info contact",
"Other Info": "Autre Info",
"Ok To Canvass": "Ok pour la campagne",
- "Assign a Canvasser": "Assigné un solliciteur ",
+ "Assign a Canvasser": "Assigné un solliciteur ",
"Assign a Brave Canvasser": "Assigner un Brave solliciteur",
"Envelope Info": "Info enveloppe",
- "Custom Fields": "Champs Personnalisés",
+ "Custom Fields": "Champs Personnalisés",
"Family Members": "Membres de la Famille",
- "You may create family members now or add them later. All entries will become new person records.": "Vous devriez créer les membres de famille maintenant ou les ajouter plus tard. Toutes les entrées deviendront de nouveaux enregistrements de personne.",
+ "You may create family members now or add them later. All entries will become new person records.": "Vous devriez créer les membres de famille maintenant ou les ajouter plus tard. Toutes les entrées deviendront de nouveaux enregistrements de personne.",
"First": "Premier",
"Middle": "Milieu",
"Last": "Dernier",
"Role": "Rôle",
"Day": "Jour",
- "Select Gender": "Sélectionner Sexe",
- "Select Role": "Sélectionner Rôle",
+ "Select Gender": "Sélectionner Sexe",
+ "Select Role": "Sélectionner Rôle",
"Unknown": "Inconnu",
"January": "Janvier",
- "February": "Février",
+ "February": "Février",
"March": "Mars",
"April": "Avril",
"May": "Mai",
"June": "Juin",
"July": "Juillet",
- "August": "Août ",
+ "August": "Août ",
"September": "Septembre",
"October": "Octobre",
"November": "Novembre",
- "December": "Décembre",
+ "December": "Décembre",
"Unk": "N/D",
"Family List": "Liste des Familles",
"Add Family": "Ajouter une Famille",
@@ -413,14 +413,14 @@
"Previous Family": "Famille précédente",
"Next Family": "Famille suivante",
"Delete this Family": "Effacer cette famille",
- "Upload Photo": "Télécharger Photo",
+ "Upload Photo": "Télécharger Photo",
"Delete Photo": "Effacer Photo",
"Add a Note": "Ajouter une note",
"Add All Family Members to Cart": "Ajouter tous les membres de la famille au panier",
"Timeline": "Chronologie",
"Automatic Payments": "Paiements automatiques",
"Pledges and Payments": "Contributions et paiements",
- "No property assignments.": "Aucune Propriétés n'est attribuées.",
+ "No property assignments.": "Aucune Propriétés n'est attribuées.",
"Value": "Valeur",
"Edit Value": "Modifier la Valeur",
"Assign a New Property": "Assigner une Nouvelle Propriété",
@@ -428,17 +428,17 @@
"Next payment date": "Prochaine date de paiement",
"Interval (months)": "Intervalle (en mois)",
"Date Updated": "Mise à jour Date",
- "Updated By": "Mise à jour par",
+ "Updated By": "Mise à jour par",
"Add a new automatic payment": "Ajouter un nouveau Paiement automatique",
"Show Pledges": "Voir les contributions",
"Show Payments": "Voir Paiement",
"Since": "depuis",
- "Update": "Mise à jour",
+ "Update": "Mise à jour",
"Pledge or Payment": "Contribution ou paiement",
"Date": "Date",
"NonDeductible": "Non déductibles",
"Schedule": "Calendrier",
- "Method": "Méthode",
+ "Method": "Méthode",
"Comment": "Commenter",
"Add a new pledge": "Ajouter un nouvel contribution",
"Add a new payment": "Ajouter un nouveau paiement",
@@ -454,7 +454,7 @@
"Financial Reports": "Rapports Financiers",
"No records were returned from the previous report.": "Aucun enregistrement n'a été renvoyée par le rapport précédent.",
"Report Type:": "Type de Rapport",
- "Select Report Type": "Sélectionnez un Type de Rapport",
+ "Select Report Type": "Sélectionnez un Type de Rapport",
"Pledge Summary": "Résumé de la contribution",
"Pledge Family Summary": "Résumé de la contribution familiale\n",
"Pledge Reminders": "Rappels des contributions",
@@ -476,7 +476,7 @@
"Filter by Payment Type:": "Filtrer par type de paiement:",
"All Methods": "Toutes les méthodes",
"Check": "Vérifier",
- "Cash": "Espèce",
+ "Cash": "Espèce",
"Bank Draft": "Bank Draft",
"eGive": "eGive",
"Minimun Total Amount:": "Montant total Minimum :",
@@ -503,7 +503,7 @@
"Deposit Report": "Rapport de dépôt",
"CSV": "CSV",
"Back": "Arrière",
- "Create Report": "Créer un Rapport",
+ "Create Report": "Créer un Rapport",
"Deposit Listing": "Liste des Dépôt",
"Add New Deposit": "Ajouter un nouveau dépôt",
"Deposits: ": "Dépôts: ",
@@ -516,7 +516,7 @@
"Apply Filters": "Appliquer Filtres",
"Date End": "Date de fin",
"Clear Filters": "Effacer le filtres",
- "Previous Page": "Page Précédente",
+ "Previous Page": "Page Précédente",
"Next Page": "Page Suivante",
"Display:": "Affichage:",
"Number": "Nombre",
@@ -556,40 +556,40 @@
"Group Member Roles": "Rôles des Membres du Groupe",
"Clone roles": "Cloner rôles",
"from group": "du groupe",
- "Select a group": "Sélectionner groupe",
+ "Select a group": "Sélectionner groupe",
"Group Specific Properties: ": "Propriétés spécifiques du groupe:␣",
"Enabled": "Activer",
- "Edit Group-Specific Properties Form": "Modifier les Propriétés Spécifiques du Formulaire pour un Groupe",
+ "Edit Group-Specific Properties Form": "Modifier les Propriétés Spécifiques du Formulaire pour un Groupe",
"Disabled": "Désactivé",
"Enable Group Specific Properties": "Activer propriétés spécifiques de groupe",
- "Group Roles": "Rôles du Groupe",
+ "Group Roles": "Rôles du Groupe",
"Group role name changes are saved as soon as the box loses focus": "Le nom du rôle de groupe est enregistré quand la boîte de diaglogue n'est plus au premier plan.",
- "New Role": "Nouveau Rôle",
+ "New Role": "Nouveau Rôle",
"Add New Role": "Ajouter Nouveau rôle",
"Group Listing": "Listing Groupes",
"Add New Group": "Ajouter Nouveau Groupe",
"Submit": "Soumettre",
"Group Member Properties Editor": "Editeur Propriétés des Membres du Groupe",
- "This group currently has no properties! You can add them in the Group Editor.": "Ce groupe n'a actuellement aucune Propriété! Vous pouvez l'ajouter dans l'éditeur de Groupe.",
- "Return to Person Record": "Retourner à de votre enregistrement des personnes",
+ "This group currently has no properties! You can add them in the Group Editor.": "Ce groupe n'a actuellement aucune Propriété! Vous pouvez l'ajouter dans l'éditeur de Groupe.",
+ "Return to Person Record": "Retourner à de votre enregistrement des personnes",
"Editing": "Editer;",
- "data for member": "données du membre",
- "Group-Specific Properties Form Editor:": "Éditeur de Formulaire des Propriétés Spécifiques du Groupe:",
- "No properties have been added yet": "Aucune Propriété n'a encore été ajouté",
- "Warning: Field changes will be lost if you do not 'Save Changes' before using an up, down, delete, or 'add new' button!": "Attention: Les champs modifiés seront perdus si vous ne 'Sauvez les Changements' avant'utiliser les bouton haut, bas, supprimer ou 'ajouter nouveau'",
+ "data for member": "données du membre",
+ "Group-Specific Properties Form Editor:": "Éditeur de Formulaire des Propriétés Spécifiques du Groupe:",
+ "No properties have been added yet": "Aucune Propriété n'a encore été ajouté",
+ "Warning: Field changes will be lost if you do not 'Save Changes' before using an up, down, delete, or 'add new' button!": "Attention: Les champs modifiés seront perdus si vous ne 'Sauvez les Changements' avant'utiliser les bouton haut, bas, supprimer ou 'ajouter nouveau'",
"Show in": "Montrer",
"Person View": "Visualiser Personne",
"Group reports": "Rapports du Groupe",
- "Select the group you would like to report": "Sélectionnez le groupe pour lequel vous voulez un rapport",
+ "Select the group you would like to report": "Sélectionnez le groupe pour lequel vous voulez un rapport",
"No Role Selected": "Aucun rôle sélectionné",
"Only cart persons?": "Seulement le Panier des Personnes?",
- "Report Model": "Modèle de Rapport",
- "Report for group and role selected": "Rapport du groupe et rôle sélectionnés",
- "Report for any role in group selected": "Rapport pour tout rôle dans groupe choisi",
- "Select which information you want to include": "Sélectionnez informations à inclure",
+ "Report Model": "Modèle de Rapport",
+ "Report for group and role selected": "Rapport du groupe et rôle sélectionnés",
+ "Report for any role in group selected": "Rapport pour tout rôle dans groupe choisi",
+ "Select which information you want to include": "Sélectionnez informations à inclure",
"Standard Info": "Info Standard",
"Other Email": "Autre Email",
- "GroupRole": "Rôle du Groupe",
+ "GroupRole": "Rôle du Groupe",
"Group-Specific Property Fields": "Champs des propriétés du Groupe spécifiques ",
"Undefined": "Non défini",
"Group View": "Visualiser Groupe",
@@ -598,7 +598,6 @@
"Delete this Group": "Supprimer Groupe",
"Confirm Delete Group": "Confirmer suppression groupe",
"Please confirm deletion of this group record": "Merci de confirmer la suppression de votre enregistrement du groupe",
- "This will also delete all Roles and Group-Specific Property data associated with this Group record.": "Ceci supprimera également tous les rôles et données des Propriétés spécifique du groupe liés à de votre enregistrement. ce groupe.",
"All group membership and properties will be destroyed. The group members themselves will not be altered.": "Tous les adhésions et propriétés du groupe seront détruites. Les membres du groupes seront modifiés également.",
"Change Member Role": "Changer rôle du membre",
"Please select target role for member": "Sélectionner le rôle cible pour le membre",
@@ -610,10 +609,9 @@
"Map this group": "Localiser le groupe",
"Email Group": "Mail au groupe",
"Total Members": "Total des Membres",
- "Default Role": "Rôle par Défaut",
- "Group-Specific Properties": "Propriétés Spécifiques au Groupe",
+ "This will also delete all Roles and Group-Specific Property data associated with this Group record.": "Ceci supprimera également tous les rôles et données des Propriétés spécifique du groupe liés à de votre enregistrement. ce groupe.",
"Disabled for this group.": "Désactivé pour ce groupe.",
- "Assigned Properties": "Propriétés Assignées",
+ "Assigned Properties": "Propriétés Assignées",
"Group Members:": "Membres du Groupe:",
"Group members: ": "Membres du groupe: ",
"Remove Selected Members from group": "Supprimer les membres sélectionnées du groupe ",
@@ -640,19 +638,19 @@
"Please Login": "Merci de vous identifier",
"Email/Username": "Mail/Nom d'utilisateur",
"Password": "Mot de Passe",
- "Login": "Identifiant",
+ "Login": "Connexion",
"Envelope Manager": "Gestion des Enveloppes pour les Cotisations",
"Update Family Records": "Mettre à jour enregistrements de la famille ",
"Update Envelopes": "Mise à jour des enveloppes",
"Confirm": "Confirmer",
"Sort by": "Trier par",
"Zero": "Zéro",
- "Assign starting at #": "Assignée: le début à #",
+ "Assign starting at #": "Assignée le début à #",
"Unable to display map due to missing Church Latitude or Longitude. Please update the church Address in the settings menu.": "Impossible d'afficher la carte car la longitude ou la latitude de l'église sont manquantes. Faîtes la mise à jour de l'adresse de l'église dans le menu paramètres.",
"Google Map API key is not set. The Map will work for smaller set of locations. Please create a Key in the maps sections of the setting menu.": "La clé de Google MAP API n'est pas mise en place. La carte fonctionnera pour quelques localisations. Créer une Clé dans la section maps du menu paramètres",
"Member Role Change": "Le rôle du membre a changé",
"Member's Name": "Noms des Membres",
- "Current Role": "Rôle Actuel",
+ "Current Role": "Rôle Actuel",
"Members Dashboard": "Tableau de bord Membres",
"Members Functions": "Fonctions des Membres",
"All People": "Toutes les personnes",
@@ -669,8 +667,8 @@
"See All People": "Plus d'infos",
"Sunday School Kids": "Enfants Ecole du dimanche",
"More info": "Plus d'info",
- "Reports on groups and roles": "Rapport sur les groupes et les rôles",
- "Report on group and roles selected (it may be a multi-page PDF).": "Rapport sur les groupes et rôles sélectionnés (possibilité de page multiple PDF).",
+ "Reports on groups and roles": "Rapport sur les groupes et les rôles",
+ "Report on group and roles selected (it may be a multi-page PDF).": "Rapport sur les groupes et rôles sélectionnés (possibilité de page multiple PDF).",
"Members Directory": "Annuaire Membres",
"Printable directory of all members, grouped by family where assigned": "Annuaire imprimable de tous les membres par famille",
"Generate letters and mailing labels.": "Générer étiquettes de lettres et publipostage.",
@@ -685,79 +683,79 @@
"Women": "Femmes",
"Boys": "Garçons",
"Girls": "Filles",
- "Sunday School Classes": "Classes École du dimanche",
+ "Sunday School Classes": "Classes école du dimanche",
"Deposit Tracking": "Suivi du dépôt",
- "Latest Families": "Dernière famille",
+ "Latest Families": "Dernière famille",
"Family Name": "Nom de Famille",
- "Updated Families": "Familles mises à jour",
- "Updated": "Mise à jour",
- "Latest Members": "Dernier membres ajoutés",
- "Updated Members": "Membres à jour",
+ "Updated Families": "Familles mises à jour",
+ "Updated": "Mise à jour",
+ "Latest Members": "Dernier membres ajoutés",
+ "Updated Members": "Membres à jour",
"Note Delete Confirmation": "Confirmation note d'effacement",
"Please confirm deletion of this note": "Confirmez la suppression de la note",
"Yes, delete this record": "Oui, supprimer cet enregistrement",
- "(this action cannot be undone)": "(cette action ne peut être annulée)",
+ "(this action cannot be undone)": "(cette action ne peut être annulée)",
"Note Editor": "Éditeur de Note",
- "Private": "Privé",
+ "Private": "Privé",
"Person": "Personne",
"Group": "Groupe",
"Option": "Option",
"Warning: Removing will reset all assignments for all persons with the assignment!": "Avertissement: Suppression réinitialise toutes les affectations pour toutes les personnes de la mission!",
"Error: Duplicate": "Erreur: Duplication",
- "Default": "Défaut",
+ "Default": "Défaut",
"Duplicate name found.": "Nom de Duplication trouvé.",
"Make Default": "Par Défaut",
"Exit": "Quitter",
"Add New": "Ajouter Nouveau",
"Error: A ": "Erreur: Un",
- " by that name already exists.": " par ce nom existe déjà.",
+ " by that name already exists.": " par ce nom existe déjà.",
"Buyer Number Editor": "Gestionnaire Utilisateur",
"Generate Statement": "Générer déclaration",
"Buyers for this fundraiser:": "Acheteurs de cette levée de fonds:",
- "Select all": "Sélectionner tous",
+ "Select all": "Sélectionner tous",
"Select none": "Sélectionner aucun",
"Add Buyer": "Ajouter Acheteur",
"Generate Statements for Selected": "Générer déclaration pour la sélection",
- "Select": "Sélectionner",
+ "Select": "Sélectionner",
"Custom Person Fields Editor": "Editeur de Champs Personnalisés pour les personnes",
- "Warning: By deleting this field, you will irrevokably lose all person data assigned for this field!": "Attention: En supprimant ce champ, vous perdrez de fait toutes les données de personne assignées à ce champ!",
- "No custom person fields have been added yet": "Aucun champ personnalisé n'a encore été ajouté",
- "Person-View Side": "Personne - Fiche Associée",
+ "Warning: By deleting this field, you will irrevokably lose all person data assigned for this field!": "Attention: En supprimant ce champ, vous perdrez de fait toutes les données de personne assignées à ce champ!",
+ "No custom person fields have been added yet": "Aucun champ personnalisé n'a encore été ajouté",
+ "Person-View Side": "Personne - Fiche Associée",
"Person Editor": "Editeur Personnes",
"You must enter a Last Name if no Family is selected.": "Vous devez entrer un Nom de famille si aucune Famille n'est sélectionnée.",
"Not a valid Friend Date": "Date d'amitié invalide ",
- "Not a valid Membership Date": "Date d'Adhésion Invalide",
+ "Not a valid Membership Date": "Date d'Adhésion Invalide",
"Work Email is Not Valid": "Email travail invalide",
"Red text": "Texte Rouge",
- "indicates items inherited from the associated family record.": "indique les objets hérités de l'enregistrement associé à la famille.",
+ "indicates items inherited from the associated family record.": "indique les objets hérités de l'enregistrement associé à la famille.",
"Personal Info": "Info personnelle",
"Mr., Mrs., Dr., Rev.": "Mr., Mme., Dr., Past.",
"Jr., Sr., III": "Jr, Mr, Mlle",
"Birth Month": "Mois de Naissance",
- "Select Month": "Sélectionner un mois",
+ "Select Month": "Sélectionner un mois",
"Birth Day": "Jour de Naissance",
- "Select Day": "Sélectionner jour",
- "Birth Year": "Année de Naissance",
+ "Select Day": "Sélectionner jour",
+ "Birth Year": "Année de Naissance",
"Hide Age": "Cacher âge",
"Create a new family (using last name)": "Créez nouvelle famille (avec nom de famille)",
"Membership Info": "Information sur adhésion",
"Friend Date": "Date d'amitié",
"Add Person to Group": "Ajouter Personne au Panier",
- "Select the group to add this person to": "Sélectionnez groupe pour ajouter la personne",
+ "Select the group to add this person to": "Sélectionnez groupe pour ajouter la personne",
"Person Profile": "Profile de la Personne",
- "Not assigned": "Non assigné",
+ "Not assigned": "Non assigné",
"About Me": "A propos de moi",
"Printable Page": "Page Imprimable",
"Edit \"Why Came\" Notes": "Editer la note \"Raison de sa venue\"",
"Delete this Record": "Effacer cet Enregistrement",
- "Make User": "Créer Utilisateur",
+ "Make User": "Créer Utilisateur",
"Edit User": "Editer Utilisateur",
"List Members": "Lister des membres",
"No group assignments.": "Aucun tâches assignés au groupe",
- "Change Role": "Changer rôle",
- "Update Properties": "Mise à jour Propriétés.",
+ "Change Role": "Changer rôle",
+ "Update Properties": "Mise à jour Propriétés.",
"Assign New Group": "Assignez Nouveau Groupe",
- "Person will be assigned to the Group in the Default Role.": "La personne sera assigner au groupe avec le rôle par défaut.",
+ "Person will be assigned to the Group in the Default Role.": "La personne sera assigner au groupe avec le rôle par défaut.",
"Assign User to Group": "assigner utilisateur au groupe",
"No volunteer opportunity assignments.": "Aucunes opportunités de bénévolat assignées.",
"Assign a New Volunteer Opportunity": "Assigner une Nouvelle Propriété de bénévolat",
@@ -767,7 +765,7 @@
"Electronic Transaction Details": "Détails de la transaction électronique",
"NonDeductible amount can't be greater than total amount.": "Le montant non déductible ne peut être supérieur au montant total.",
"At least one fund must have a non-zero amount.": "Au moins un fonds doit avoir une valeur non nulle.",
- "Must specify non-zero check number": "Vous devez écrire un nombre différent de 0.",
+ "Must specify non-zero check number": "Vous devez écrire un nombre différent de 0.",
"Check number not valid for 'CASH' payment": "numéro de chèque non valide pour du paiement 'CASH'",
"Pledge Editor": "Editeur de contribution",
"Payment Editor: ": "Editeur de Paiements",
@@ -778,7 +776,7 @@
"Deposit closed": "Dépôt cloturé",
"Find family->": "Famille trouvé->",
"Payment Schedule": "Calendrier de paiement",
- "Select Schedule": "Sésectionner type calendrier",
+ "Select Schedule": "Sésectionner type calendrier",
"Weekly": "Hebdomadaire",
"Monthly": "Mois",
"Quarterly": "Trimestriel",
@@ -788,7 +786,7 @@
"Choose online payment method": "Choisissez la méthode de paiement en ligne",
"Select online payment record": "Sélectionner votre enregistrement de paiement en ligne",
"Bank account ": "Compte bancaire",
- "Scan check": "Scan du chèque",
+ "Scan check": "Scan du chèque",
"find family from check account #": "Rechercher famille par compte chèque #",
"Set default check account number for family": "Réglez le numéro de compte chèque par défaut pour la famille",
"Fund Name": "Nom des Fonds",
@@ -800,16 +798,16 @@
"Notes:": "Notes:",
"Entered:": "Saisie le : ",
"by": "par",
- "Property successfully assigned.": "La Propriété a été assignée avec succès.",
+ "Property successfully assigned.": "La Propriété a été assignée avec succès.",
" Property Assignment": " Attribution de Propriété",
- "Assigning": "Assignée",
+ "Assigning": "Assignée",
"Property Delete Confirmation": "Confirmer la Suppression de Propriété",
"Please confirm deletion of this property": "Merci de confirmer la suppression de cette Propriété",
"Deleting this Property will also delete all assignments of this Property to any People, Family, or Group records.": "Supprimer cette Propriété entrainera également toute suppression des Propriétés associées aux personnes, familles, ou groupes.",
"No, cancel this deletion": "Non, annuler cette suppression",
"Property Editor": "Éditeur de Propriété",
- "You must select a type": "Vous devez sélectionner un Type",
- "Select Property Type": "Sélectionnez un Type de Propriété",
+ "You must select a type": "Vous devez sélectionner un Type",
+ "Select Property Type": "Sélectionnez un Type de Propriété",
"A": "Un",
"Entering a Prompt value will allow the association of a free-form value.": "Saisir une valeur Invite (Invite de commande) permettra l'association d'une valeur de formulaire libre.",
"Property List": "Liste des Propriétés",
@@ -819,7 +817,7 @@
"Property Type Delete Confirmation": "Confirmation Suppression Type de Propriété",
"Warning": "Attention",
"This property type is still being used by at least one property.": "Ce type de Propriété est encore utilisé par au moins une propriété.",
- "If you delete this type, you will also remove all properties using": "Si vous supprimez ce type, vous enlèverez également tout les Propriétés utilisées",
+ "If you delete this type, you will also remove all properties using": "Si vous supprimez ce type, vous enlèverez également tout les Propriétés utilisées",
"it and lose any corresponding property assignments.": "et vous perdrez toutes les Propriétés des tâches correspondantes.",
"Please confirm deletion of this Property Type": "Merci de confirmer la suppression du Type de Propriété",
"Property Type Editor": "Editeur de Type de Propriété",
@@ -827,31 +825,31 @@
"Add a New Property Type": "Ajouter Nouveau Type de Propriété",
"Class": "Classe",
"Properties": "Propriétés",
- " Property Unassignment": " Propriété non Assignée",
- "Please confirm removal of this property from this": "Veuillez confirmer le déplacement de cette Propriété",
+ " Property Unassignment": " Propriété non Assignée",
+ "Please confirm removal of this property from this": "Veuillez confirmer le déplacement de cette Propriété",
"Unassigning": "Non assigné",
"Yes, unassign this Property": "Oui, ne pas assigné cette Propriété",
"No, retain this assignment": "Non, maintenir cette assignation",
"Query Listing": "Listing des Query",
- "Run a Free-Text Query": "Exécuter une Requête Libre",
- "Free-Text Query": "Requête Texte Libre",
+ "Run a Free-Text Query": "Exécuter une Requête Libre",
+ "Free-Text Query": "Requête Texte Libre",
"Export Results to CSV file": "Exporter les résultats vers un fichier CSV",
- "Execute SQL": "Exécuter SQL",
+ "Execute SQL": "Exécuter SQL",
"An error occured: ": "Une erreur s'est produite: ",
- " record(s) returned": " enregistrement(s) retourné(s)",
- "Add Results To Cart": "Ajouter Résultats au Panier",
- "Intersect Results With Cart": "Intercepter Résultats au Panier",
- "Remove Results From Cart": "Supprimer Résultats du Panier",
+ " record(s) returned": " enregistrement(s) retourné(s)",
+ "Add Results To Cart": "Ajouter Résultats au Panier",
+ "Intersect Results With Cart": "Intercepter Résultats au Panier",
+ "Remove Results From Cart": "Supprimer Résultats du Panier",
"Return to Query Menu": "Retour Menu Query",
"Query View": "Voir Query",
"This value is required.": "Cette valeur est requise.",
- "This value must be numeric.": "Cette valeur doit être numérique.",
- "This value must be at least ": "Cette valeur doit être au moins ",
- "This value cannot be more than ": "Cette valeur ne peut pas être supérieure à ",
+ "This value must be numeric.": "Cette valeur doit être numérique.",
+ "This value must be at least ": "Cette valeur doit être au moins ",
+ "This value cannot be more than ": "Cette valeur ne peut pas être supérieure à ",
" characters long": " caractères long",
- "This value cannot be less than ": "Cette valeur ne peut pas être inférieure à ",
- "Run Query Again": "Exécuter Requête à Nouveau",
- "Execute Query": "Exécutez la Requête ",
+ "This value cannot be less than ": "Cette valeur ne peut pas être inférieure à ",
+ "Run Query Again": "Exécuter Requête à Nouveau",
+ "Execute Query": "Exécutez la Requête ",
"Address Info:": "Info Adresse:",
"Software Registration": "Enregistrement du logiciel",
"Please register your copy of ChurchCRM by checking over this information and pressing the Send button. ": "Enregistrez votre copie de ChurchCRM en vérifiant les informations et en appuyant sur le bouton Envoyer.",
@@ -861,7 +859,7 @@
"Report Menu": "Menu Rapports",
"Automated support for conducting an every-member canvass.": "Support automatisé pour effectuer une campagne pour tous les membres.",
"Event Attendance Reports": "Rapports de présence pour l'événement",
- "Restore Database": "Restaurer la Base de Données",
+ "Restore Database": "Restaurer la Base de Données",
"All donations from this family have been moved to another family.": "Tous les dons de cette famille ont été transférés à une autre famille.",
"Family Delete Confirmation": "Confirmation de la suppression de la famille",
"Please confirm deletion of": "Veuillez confirmer la suppression de",
@@ -872,7 +870,8 @@
"WARNING: This action can not be undone and may have legal implications!": "AVERTISSEMENT: Cette action ne peut pas être annulée et pourrait avoir des implications juridiques!",
"CURRENT FAMILY WITH DONATIONS": "FAMILLE ACTUELLE AVEC LES DONS",
"Please confirm deletion of this family record:": "Merci de confirmer la suppression de votre enregistrement de cette famille:",
- "Note: This will also delete all Notes associated with this Family record.": "Note : Ceci supprimera également toutes les notes liées à cet enregistrement Famille.",
+ "Default Role": "Rôle par Défaut",
+ "Group-Specific Properties": "Propriétés Spécifiques au Groupe",
"Delete Family Record ONLY": "Effacer votre Enregistrement de la famille seulement",
"Delete Family Record AND Family Members": "Supprimer de votre enregistrement de la famille ET de ses membres.",
"Person Listing": "Liste des Personnes",
@@ -882,7 +881,7 @@
"Sort order": "Ordre de tri",
"By Name": "Par Nom",
"By Family": "Par Famille",
- "By Newest Entries": "Par Entrées les plus récentes",
+ "By Newest Entries": "Par Entrées les plus récentes",
"By Recently Edited": "Par récemment édité",
"Apply Filter": "Appliquer le Filtre",
"Male & Female": "Homme & Femme",
@@ -891,7 +890,7 @@
"All Contact Properties": "Toutes les propriétés de Contact",
"All Group Types": "Tous les types de groupes",
"All Groups": "Tous les Groupes",
- "All Roles": "Tous les Rôle",
+ "All Roles": "Tous les Rôle",
"Listing": "Listing",
"View All": "Tout voir",
"Cart": "Panier",
@@ -920,14 +919,14 @@
"Edit Records": "Editer Enregistrements",
"Delete Records": "Effacer Enregistrements",
"Manage Properties and Classifications": "Gestion Propriétés et Classifications",
- "Manage Groups and Roles": "Gestion des Groupes et Rôles",
+ "Manage Groups and Roles": "Gestion des Groupes et Rôles",
"Manage Donations and Finance": "Gestion Cotisations et Finances",
"View, Add and Edit Notes": "Visualiser, Ajouter et Éditer les notes",
"Edit Self": "Edition de soi même",
"(Edit own family only.)": "(Modifier propre famille uniquement.)",
"(Canvass volunteer.)": "(bénévole pour une campagne.)",
"Admin": "Administrateur",
- "(Grants all privileges.)": "(Avoir tous les privilèges.)",
+ "(Grants all privileges.)": "(Avoir tous les privilèges.)",
"Style": "Style",
"Set Permission True to give this user the ability to change their current value.": "Mettre les permissions à \"True\", pour permettre à l'utilisateur de modifier ses valeurs courantes.",
"User Listing": "Listing Utilisateurs",
@@ -940,15 +939,15 @@
"You must enter the same password in both boxes": "Vous devez entrer le même mot de passe dans des les deux champs",
"Invalid password": "Mot de passe invalide",
"You must enter your new password in both boxes": "Vous devez entrer votre nouveau mot de passe dans les deux champs",
- "Your password choice is too obvious. Please choose something else.": "Votre mot de passe est trop évident. Veuillez en choisir un autre.",
+ "Your password choice is too obvious. Please choose something else.": "Votre mot de passe est trop évident. Veuillez en choisir un autre.",
"Your new password must be at least": "Votre nouveau mot de passe doit au moins avoir",
- "characters": "caractères",
- "You need to actually change your password (nice try, though!)": "Vous devez réellement changer votre mot de passe",
- "Your new password is too similar to your old one. Be more creative!": "Votre nouveau mot de passe est trop similaire à l'ancien. Soyez plus créatif!",
+ "characters": "caractères",
+ "You need to actually change your password (nice try, though!)": "Vous devez réellement changer votre mot de passe",
+ "Your new password is too similar to your old one. Be more creative!": "Votre nouveau mot de passe est trop similaire à l'ancien. Soyez plus créatif!",
"User Password Change": "Changement du Mot de Passe Utilisateur",
"Your account record indicates that you need to change your password before proceding.": "L'enregistrement de votre compte indique que vous devez changer votre mot de passe avant de continuer.",
- "Enter your current password, then your new password twice. Passwords must be at least": "Entrez votre mot de passe actuel, puis votre nouveau mot de passe deux fois. Les mots de passe doivent être au moins",
- "characters in length.": "caractères de long.",
+ "Enter your current password, then your new password twice. Passwords must be at least": "Entrez votre mot de passe actuel, puis votre nouveau mot de passe deux fois. Les mots de passe doivent être au moins",
+ "characters in length.": "caractères de long.",
"Enter a new password for this user.": "Entrez un nouveau mot de passe pour cet utilisateur.",
"Old Password": "Ancien Mot de Passe",
"New Password": "Nouveau Mot de Passe",
@@ -967,7 +966,7 @@
"Why do you keep coming?": "Qu'est ce qui vous motive à rester ?",
"Do you have any suggestions for us?": "Avez-vous des suggestions à nous faire?",
"How did you learn of the church?": "Comment avez-vous découvert l'église ? (un membre, le site internet, etc ...)",
- "Church Calendar": "Agenda de l'église",
+ "Church Calendar": "Agenda de l'église",
"eGive Import": "Import eGive",
"Re-import to selected family": "Réimportation à la famille sélectionnée",
"Data import results: ": "Résultats des Données importées :",
@@ -987,14 +986,14 @@
"Copyright": "Copyright",
"All rights reserved": "Tous droits réservés",
"True / False": "Vrai / Faux",
- "Text Field (50 char)": "Champ Texte (50 caractères)",
- "Text Field (100 char)": "Champ Texte (100 caractères)",
+ "Text Field (50 char)": "Champ Texte (50 caractères)",
+ "Text Field (100 char)": "Champ Texte (100 caractères)",
"Text Field (long)": "Champ Texte (long)",
"Season": "Saison",
"Person from Group": "Personne du groupe",
"Money": "Monnaie",
- "Phone Number": "Numéro de téléphone",
- "Custom Drop-Down List": "Liste déroulante personnalisée",
+ "Phone Number": "Numéro de téléphone",
+ "Custom Drop-Down List": "Liste déroulante personnalisée",
"Thank you for registering your ChurchCRM installation.": "Merci d'enregistrer votre installation de ChurchCRM.",
"PDFs successfully emailed ": "PDFs envoyé avec succès␣ ",
"PDF successfully emailed to family members.": "PDF envoyé avec succès à tous les membres de la famille",
@@ -1007,9 +1006,9 @@
"Selected record successfully added to the Cart.": "L'Enregistrement sélectionné a été ajouté au panier avec succès.",
"Family successfully added to the Cart.": "La famille a été ajouté avec succès au panier.",
"Selected record successfully removed from the Cart.": "Les enregistrements sélectionnés ont bien été supprimé du panier.",
- "Your cart has been successfully emptied.": "Votre panier a bien été vidé.",
- "item(s) added to the Cart.": "item(s) ajouté(s) au panier.",
- "Select Fiscal Year": "Sésectionner l'année fiscale",
+ "Your cart has been successfully emptied.": "Votre panier a bien été vidé.",
+ "item(s) added to the Cart.": "item(s) ajouté(s) au panier.",
+ "Select Fiscal Year": "Sésectionner l'année fiscale",
"pm": " ",
"am": " ",
"1 m old": "depuis 1 mois",
@@ -1020,15 +1019,15 @@
"Select Season": "Choisissez la saison",
"Winter": "Hiver",
"Spring": "Printemps",
- "Summer": "Eté",
+ "Summer": "Eté",
"Fall": "Automne",
"Error: Invalid Editor ID!": "Erreur: ID d'éditeur non valide!",
"Not a valid date": "Date invalide",
- "Invalid Year": "Année Invalide",
- "Out of range: Allowable values are 1901 to 2155": "Année Invalide: les valeurs permises sont comprise entre 1901 et 2155",
- "Invalid Number": "Numéro invalide",
- "Number too large. Must be between -2147483648 and 2147483647": "Nombre trop grand Celui-ci doit être compris entre -2147483648 et 2147483647",
- "Money amount too large. Maximum is $999999999.99": "Le montant indiqué est trop important. Le Maximum est 999999999.99",
+ "Invalid Year": "Année Invalide",
+ "Out of range: Allowable values are 1901 to 2155": "Année Invalide: les valeurs permises sont comprise entre 1901 et 2155",
+ "Invalid Number": "Numéro invalide",
+ "Number too large. Must be between -2147483648 and 2147483647": "Nombre trop grand Celui-ci doit être compris entre -2147483648 et 2147483647",
+ "Money amount too large. Maximum is $999999999.99": "Le montant indiqué est trop important. Le Maximum est 999999999.99",
" Bold Italic": " Gras Italique",
" Italic": " Italique",
" Bold": " Gras",
@@ -1047,14 +1046,14 @@
"task(s)": "Tâche(s)",
"Home": "Accueil",
"Font": "Polices",
- "Label Type": "Type d'étiquette",
+ "Label Type": "Type d'étiquette",
"Label Grouping": "Groupement étiquette",
"All Individuals": "Toute personne",
- "Grouped by Family": "Groupé par Famille",
+ "Grouped by Family": "Groupé par Famille",
"To the parents of": "Pour les parents de",
"Start Row": "ligne de départ",
- "Start Column": "Colonne de Départ",
- "Ignore Incomplete Addresses": "Ignorez les Adresses Incomplète s",
+ "Start Column": "Colonne de Départ",
+ "Ignore Incomplete Addresses": "Ignorez les Adresses Incomplètes",
"File Type": "Type de fichier",
"items": "items",
"Did not pledge": "Ne contribue pas",
@@ -1068,7 +1067,7 @@
"Send Newsletter": "Envoyer Newsletter",
"Member Name": "Noms du Membre",
"Adult/Child": "Adulte / Enfant",
- "Cell Phone": "Téléphone Portable",
+ "Cell Phone": "Téléphone Portable",
"Member/Friend": "Membre/Ami",
"This option requires at least version 3.22 of MySQL! Hit browser back button to return to ChurchCRM.": "Cette option nécessite au moins la version 3.22 de MySQL! Toucher le bouton retour du navigateur pour revenir à ChurchCRM.",
"Work": "Travail",
@@ -1098,7 +1097,7 @@
"Group Directory": "Annuaire du Groupe",
"Please detach this slip and mail with your next gift.": "S'il vous plaît détacher ce feuillet et le poster avec votre prochain cadeau/don.",
"Please mail you next gift to ": "S'il vous plaît vous envoyer don à côté de",
- "Gift Amount:": "Quantité:",
+ "Gift Amount:": "Quantité:",
"Gift Designation:": "Description:",
"Sunday School": "Ecole du dimanche",
"Sunday School Class Functions": "Fonctions dans l'école du dimanche",
@@ -1278,13 +1277,13 @@
"Actual Hash": "Hash actuel",
"Family:": "Famille:",
"item": "item",
- "Address 1": "Adresse1:",
- "Address 2": "Adresse2:",
- "Cell phone": "Téléphone Portable",
+ "Address 1": "Adresse 1",
+ "Address 2": "Adresse 2",
+ "Cell phone": "Téléphone Portable",
"-----------------------------------------------------------------------------------------------------------------------------------------------": "-----------------------------------------------------------------------------------------------------------------------------------------------",
"Buyer # ": "Acheteur #",
"Envelope:": "Enveloppe:",
- ", Phone: ": "Téléphone",
+ ", Phone: ": "Téléphone",
"Voting members ": "Tous les Membres:",
"Restore Running, Please wait.": "Restauration en cours, Veuillez patienter.",
"Family Members:": "Membres de la Famille:",
@@ -1294,13 +1293,13 @@
"Reports": "Rapport",
"File Name:": "Nom du fichier:",
"http://www.intelligentsearch.com/address_verification/verify_address.html": "http://www.intelligentsearch.com/address_verification/verify_address.html",
- "Fiscal Year:": "Année Fiscale:",
+ "Fiscal Year:": "Année Fiscale:",
"Important note: this will lose any "Ok To Canvass" fields that have been set by hand.": "Note importante : cette action va effacer les champs "Ok pour campagne" qui ont été saisi à la main.",
"Canvasser:": "Démarcheur:",
"Add Attendees for Event": "Ajouter des ",
"family": "Fmaille",
"Anniversary Date:": "Date d'Anniversaire:",
- "Date Entered:": "Date d'Entrée:",
+ "Date Entered:": "Date d'Entrée:",
"CSV Import": "Import au format CSV",
"Comment:": "Pays:",
"Closed:": "Classe:",
@@ -1315,8 +1314,8 @@
"Add New Deposit: ": "Ajouter Nouveau Dépôt",
"Estimated value": "Valeur estimée",
"Disable Group Specific Properties": "Désactiver les propriétés spécifiques de groupe",
- "'Default Option'": "'Option par Défaut'",
- "Text Group": "Groupe Texte",
+ "'Default Option'": "'Option par Défaut'",
+ "Text Group": "Texto au groupe",
"Group Properties": "Propriétés Groupes",
"Assign a New Property:": "Assigner une Nouvelle Propriété:",
"mos old": "agé de ...",
@@ -1406,7 +1405,7 @@
"Interval in Hours for Integrity Check": "Intervalle en heure pour le test d'intégrité",
"Last Integrity Check Timestamp": "Date de la dernière le test d'intégrité",
"Main": "Principale",
- "List Groups": "Lister toutes les groupes",
+ "List Groups": "Lister tous les groupes",
"Edit Group Types": "Editer les types de groupes",
"List Church Events": "Lister les événements de l'église",
"Add Church Event": "Ajouter un nouvel événement d'église",
@@ -1848,7 +1847,6 @@
"Church Address is not Set.": "L'adresse de l'église n'est pas fixée.",
"Church Name is set to default value": "Le nom de l'église est à sa valeur par défaut.",
"SMTP Server info are blank": "Serveur SMTP est vide",
- "In Church CRM 2.6.0 we will no longer support a work phone for a family": "Dans la version 2.6.0, le téléphone professionnel pour la famille ne sera plus supporté",
"Your system could be more secure by installing an TLS/SSL Cert.": "Votre système serait plus sécurisé avec un certificat TLS/SSL.",
"Missing Classification Data": "Données de classification manquante",
"Missing Classification Data for Some People": "Données de classification manquante pour certaine personne",
@@ -1996,6 +1994,7 @@
"Action Confirmation": "Action confirmée",
"Please confirm reset failed login count": "Confirmez-vous remise à zéro compteur échec de Login",
"Password reset for": "Mot de passe à remettre à zéro pour",
+ "Note: This will also delete all Notes associated with this Family record.": "Note : Ceci supprimera également toutes les notes liées à cet enregistrement Famille.",
"SMTP Server timeout in sec": "Timeout en sec. Serveur SMTP",
"Exclude Inactive Families": "Exclure les familles inactives",
"The role is already assigned.": "Ce rôle is déjà assigné.",
@@ -2017,7 +2016,8 @@
"system user password changed by admin": "Mot de passe utilisateur système modifié par l'admin",
"system user login reset": "Login utilisateur système remis à zéro",
"Missing Families? Update Family Latitude or Longitude now.": "Familles manquantes ? Mise à jour Latitude et Longitude pour la famille.",
- "Families without Geo Info": "Familles sans Info Géographique ",
+ "View Active Families": "Visualiser les familles actives",
+ "View Inactive Families": "Visualiser les familles inactives",
"Notification for": "Notification pour",
"DEBUG": "DEBUG",
"INFO": "INFO",
@@ -2071,5 +2071,4 @@
"Enable New Kiosk Registration": "Activer enregistrement nouveaux kiosques",
"Active Kiosks": "Kiosques actifs",
"I forgot my password": "Mot de passe oublié",
- "Attendees Checked In": "Valider Participants"
-}
+ "Families without Geo Info": "Familles sans Info Géographique",
diff --git a/src/locale/hu_HU/LC_MESSAGES/messages.js b/locale/JSONKeys/hu_HU.json
similarity index 100%
rename from src/locale/hu_HU/LC_MESSAGES/messages.js
rename to locale/JSONKeys/hu_HU.json
diff --git a/src/locale/it_IT/LC_MESSAGES/messages.js b/locale/JSONKeys/it_IT.json
similarity index 100%
rename from src/locale/it_IT/LC_MESSAGES/messages.js
rename to locale/JSONKeys/it_IT.json
diff --git a/src/locale/nb_NO/LC_MESSAGES/messages.js b/locale/JSONKeys/nb_NO.json
similarity index 100%
rename from src/locale/nb_NO/LC_MESSAGES/messages.js
rename to locale/JSONKeys/nb_NO.json
diff --git a/src/locale/nl_NL/LC_MESSAGES/messages.js b/locale/JSONKeys/nl_NL.json
similarity index 100%
rename from src/locale/nl_NL/LC_MESSAGES/messages.js
rename to locale/JSONKeys/nl_NL.json
diff --git a/src/locale/pl_PL/LC_MESSAGES/messages.js b/locale/JSONKeys/pl_PL.json
similarity index 100%
rename from src/locale/pl_PL/LC_MESSAGES/messages.js
rename to locale/JSONKeys/pl_PL.json
diff --git a/src/locale/pt_BR/LC_MESSAGES/messages.js b/locale/JSONKeys/pt_BR.json
similarity index 80%
rename from src/locale/pt_BR/LC_MESSAGES/messages.js
rename to locale/JSONKeys/pt_BR.json
index cac59594b5..19ac98b8c0 100644
--- a/src/locale/pt_BR/LC_MESSAGES/messages.js
+++ b/locale/JSONKeys/pt_BR.json
@@ -1628,4 +1628,460 @@
"Cambodia (កម្ពុជា)": "Camboja",
"Cameroon (Cameroun)": "Camarões",
"Canada": "Canadá",
- "Canary Islands (islas Cana
+ "Canary Islands (islas Canarias)": "Ilhas Canárias",
+ "Cape Verde (Kabu Verdi)": "Cabo Verde",
+ "Caribbean Netherlands": "Caribe Holandês",
+ "Cayman Islands": "Ilhas Caymãs",
+ "Central African Republic (République centrafricaine)": "República da África Central",
+ "Ceuta and Melilla (Ceuta y Melilla)": "Ceuta e Melilha",
+ "Chad (Tchad)": "Chade",
+ "Chile": "Chile",
+ "China (中国)": "China",
+ "Christmas Island": "Ilha do Natal",
+ "Clipperton Island": "Ilha de Clipperton",
+ "Cocos (Keeling) Islands (Kepulauan Cocos (Keeling))": "Ilhas Cocos",
+ "Colombia": "Colômbia",
+ "Comoros (جزر القمر)": "Comoros",
+ "Congo (DRC) (Jamhuri ya Kidemokrasia ya Kongo)": "República Democrática do Congo",
+ "Congo (Republic) (Congo-Brazzaville)": "República do Congo",
+ "Cook Islands": "Ilhas Cook",
+ "Costa Rica": "Costa Rica",
+ "Côte d’Ivoire": "Consta do Marfim",
+ "Croatia (Hrvatska)": "Croácia",
+ "Cuba": "Cuba",
+ "Curaçao": "Curaçao",
+ "Cyprus (Κύπρος)": "Chipre",
+ "Czech Republic (Česká republika)": "República Checka",
+ "Denmark (Danmark)": "Dinamarca",
+ "Diego Garcia": "Diego Garcia",
+ "Djibouti": "Djibouti",
+ "Dominica": "Dominica",
+ "Dominican Republic (República Dominicana)": "República Dominicana",
+ "Ecuador": "Equador",
+ "Egypt (مصر)": "Egito",
+ "El Salvador": "El Salvador ",
+ "Equatorial Guinea (Guinea Ecuatorial)": "Guinea Equatoprial",
+ "Eritrea": "Eritreia",
+ "Estonia (Eesti)": "Estônia",
+ "Ethiopia": "Etiópia",
+ "Falkland Islands (Islas Malvinas)": "Ilhas Falkland",
+ "Faroe Islands (Føroyar)": "Ilhas Faroe",
+ "Fiji": "Fiji",
+ "Finland (Suomi)": "Finlândia",
+ "France": "França",
+ "French Guiana (Guyane française)": "Guiana Francesa",
+ "French Polynesia (Polynésie française)": "Polinésia Francesa",
+ "French Southern Territories (Terres australes françaises)": "Territórios Franceses do Sul",
+ "Gabon": "Gabão",
+ "Gambia": "Gâmbia",
+ "Georgia (საქართველო)": "Geórgia",
+ "Germany (Deutschland)": "Alemanha",
+ "Ghana (Gaana)": "Gana",
+ "Gibraltar": "Gibraltar",
+ "Greece (Ελλάδα)": "Grécia",
+ "Greenland (Kalaallit Nunaat)": "Gronelândia",
+ "Grenada": "Grenada",
+ "Guadeloupe": "Guadalupe",
+ "Guam": "Guam",
+ "Guatemala": "Guatemala",
+ "Guernsey": "Guernsey",
+ "Guinea (Guinée)": "Guinéa",
+ "Guinea-Bissau (Guiné Bissau)": "Guinéa Bissau",
+ "Guyana": "Guiana",
+ "Haiti": "Haiti",
+ "Heard & McDonald Islands": "Ilhas de Heard & McDonald",
+ "Honduras": "Honduras",
+ "Hong Kong (香港)": "Hong Kong",
+ "Hungary (Magyarország)": "Hungria",
+ "Iceland (Ísland)": "Islândia",
+ "India (भारत)": "Índia",
+ "Indonesia": "Indonésia",
+ "Iran (ایران)": "Irã",
+ "Iraq (العراق)": "Iraque",
+ "Ireland": "Irlanda",
+ "Isle of Man": "Ilha de Man",
+ "Israel (ישראל)": "Israel",
+ "Italy (Italia)": "Itália",
+ "Jamaica": "Jamaica",
+ "Japan (日本)": "Japão",
+ "Jersey": "Jersey",
+ "Jordan (الأردن)": "Jordânia",
+ "Kazakhstan (Казахстан)": "Cazaquistão",
+ "Kenya": "Quênia",
+ "Kiribati": "Quiribati",
+ "Kosovo (Kosovë)": "Kosovo",
+ "Kuwait (الكويت)": "Kuwait",
+ "Kyrgyzstan (Кыргызстан)": "Quirguistão",
+ "Laos (ລາວ)": "Laos",
+ "Latvia (Latvija)": "Letônia",
+ "Lebanon (لبنان)": "Líbano",
+ "Lesotho": "Lesoto",
+ "Liberia": "Libéria",
+ "Libya (ليبيا)": "Líbia",
+ "Liechtenstein": "Liechtenstein",
+ "Lithuania (Lietuva)": "Lituânia",
+ "Luxembourg": "Luxemburgo",
+ "Macau (澳門)": "Macau",
+ "Macedonia (FYROM) (Македонија)": "Macedônia",
+ "Madagascar (Madagasikara)": "Madagascar",
+ "Malawi": "Malawi",
+ "Malaysia": "Malásia",
+ "Maldives": "Maldivas",
+ "Mali": "Mali",
+ "Malta": "Malta",
+ "Marshall Islands": "Ilhas Marshall",
+ "Martinique": "Martinica",
+ "Mauritania (موريتانيا)": "Mauritânia",
+ "Mauritius (Moris)": "Maurício",
+ "Mayotte": "Mayotte",
+ "Mexico (México)": "México",
+ "Micronesia": "Micronésia",
+ "Moldova (Republica Moldova)": "Moldávia",
+ "Monaco": "Mônaco",
+ "Mongolia (Монгол)": "Mongólia",
+ "Montenegro (Crna Gora)": "Montenegro",
+ "Montserrat": "Montserrat",
+ "Morocco (المغرب)": "Marrocos",
+ "Mozambique (Moçambique)": "Moçambique",
+ "Myanmar (Burma) (မြန်မာ)": "Mianmar",
+ "Namibia (Namibië)": "Namíbia",
+ "Nauru": "Nauru",
+ "Nepal (नेपाल)": "Nepal",
+ "Netherlands (Nederland)": "Holanda",
+ "New Caledonia (Nouvelle-Calédonie)": "Nova Caledônia",
+ "New Zealand": "Nova Zelândia",
+ "Nicaragua": "Nicarágua",
+ "Niger (Nijar)": "Niger",
+ "Nigeria": "Nigéria",
+ "Niue": "Niue",
+ "Norfolk Island": "Ilha de Norfolk",
+ "Northern Mariana Islands": "Ilhas Marianas do Norte",
+ "North Korea (조선 민주주의 인민 공화국)": "Coreia do Norte",
+ "Norway (Norge)": "Noruega",
+ "Oman (عُمان)": "Omã",
+ "Pakistan (پاکستان)": "Paquistão",
+ "Palau": "Palau",
+ "Palestine (فلسطين)": "Palestina",
+ "Panama (Panamá)": "Panamá",
+ "Papua New Guinea": "Papua Nova Guiné",
+ "Paraguay": "Paraguai",
+ "Peru (Perú)": "Peru",
+ "Philippines": "Filipinas",
+ "Pitcairn Islands": "Ilhas Pitcairn",
+ "Poland (Polska)": "Polônia",
+ "Portugal": "Portugal",
+ "Puerto Rico": "Porto Rico",
+ "Qatar (قطر)": "Catar",
+ "Réunion (La Réunion)": "Reunião",
+ "Romania (România)": "Roménia",
+ "Russia (Россия)": "Rússia",
+ "Rwanda": "Ruanda",
+ "Saint Barthélemy (Saint-Barthélemy)": "São Bartolomeu",
+ "Saint Helena": "Santa Helena",
+ "Saint Kitts and Nevis": "São Cristóvão e Névis",
+ "Saint Lucia": "Santa Lúcia",
+ "Saint Martin (Saint-Martin (partie française))": "San Martin",
+ "Saint Pierre and Miquelon (Saint-Pierre-et-Miquelon)": "São Pedro e Miquelon",
+ "Samoa": "Samoa",
+ "San Marino": "San Marino",
+ "São Tomé and Príncipe (São Tomé e Príncipe)": "São Tomé e Príncipe",
+ "Saudi Arabia (المملكة العربية السعودية)": "Arábia Saudita",
+ "Senegal (Sénégal)": "Senegal",
+ "Serbia (Србија)": "Sérvia",
+ "Seychelles": "Seychelles",
+ "Sierra Leone": "Serra Leoa",
+ "Singapore": "Cingapura",
+ "Sint Maarten": "Sint Maarten",
+ "Slovakia (Slovensko)": "Eslováquia",
+ "Slovenia (Slovenija)": "Eslovênia",
+ "Solomon Islands": "Ilhas Salomão",
+ "Somalia (Soomaaliya)": "Somália",
+ "South Africa": "África do Sul",
+ "South Georgia & South Sandwich Islands": "Geórgia do Sul e Ilhas Sandwich do Sul",
+ "South Korea (대한민국)": "Coréia do Sul",
+ "South Sudan (جنوب السودان)": "Sudão do Sul",
+ "Spain (España)": "Espanha",
+ "Sri Lanka (ශ්රී ලංකාව)": "Sri Lanka",
+ "St. Vincent & Grenadines": "São Vicente e Granadinas",
+ "Sudan (السودان)": "Sudão",
+ "Suriname": "Suriname",
+ "Svalbard and Jan Mayen (Svalbard og Jan Mayen)": "Svalbard e Jan Mayen",
+ "Swaziland": "Suazilândia",
+ "Sweden (Sverige)": "Suécia",
+ "Switzerland (Schweiz)": "Suíça",
+ "Syria (سوريا)": "Síria",
+ "Taiwan (台灣)": "Taiwan",
+ "Tajikistan": "Tajiquistão",
+ "Tanzania": "Tanzânia",
+ "Thailand (ไทย)": "Tailândia",
+ "Timor-Leste": "Timor Leste",
+ "Togo": "Togo",
+ "Tokelau": "Tokelau",
+ "Tonga": "Tonga",
+ "Trinidad and Tobago": "Trinidad e Tobago",
+ "Tristan da Cunha": "Tristan da Cunha",
+ "Tunisia (تونس)": "Tunísia",
+ "Turkey (Türkiye)": "Turquia",
+ "Turkmenistan": "Turcomenistão",
+ "Turks and Caicos Islands": "Ilhas Turks e Caicos",
+ "Tuvalu": "Tuvalu",
+ "U.S. Outlying Islands": "Ilhas Periféricas dos EUA",
+ "U.S. Virgin Islands": "Ilhas Virgens dos EUA",
+ "Uganda": "Uganda",
+ "Ukraine (Україна)": "Ulcrânia",
+ "United Arab Emirates (الإمارات العربية المتحدة)": "Emirados Árabes",
+ "United Kingdom": "Reino Unido",
+ "United States": "Estados Unidos",
+ "Uruguay": "Uruguai",
+ "Uzbekistan (Oʻzbekiston)": "Uzbequistão",
+ "Vanuatu": "Vanuatu",
+ "Vatican City (Città del Vaticano)": "Cidade do Vaticano",
+ "Venezuela": "Venezuela",
+ "Vietnam (Việt Nam)": "Vietnã",
+ "Wallis and Futuna": "Wallis e Futuna",
+ "Western Sahara (الصحراء الغربية)": "Saara Ocidental",
+ "Yemen (اليمن)": "Iémen",
+ "Zambia": "Zâmbia",
+ "Zimbabwe": "Zimbábue",
+ "By Zip Code": "Pelo Código Postal",
+ "Please verify your family's information": "Por favor, verifique a informação da sua família",
+ "Church Address is not Set.": "O endereço da igreja não está configurado",
+ "Church Name is set to default value": "O nome da Igreja está configurado com o valor padrão",
+ "SMTP Server info are blank": "Informação do servidor SMTP em branco",
+ "Your system could be more secure by installing an TLS/SSL Cert.": "O seu sistema podria ser mais seguro com a instalação de um certificado TLS/SSL.",
+ "Missing Classification Data": "Classificação de dados perdida",
+ "Missing Classification Data for Some People": "Classificação de dados perdida para algumas pessoas",
+ "Missing Gender Data": "Dado de gênero perdido",
+ "Missing Gender Data for Some People": "Dado de gênero perdido para algumas pessoas",
+ "Missing Role Data": "Dado do papel perdido",
+ "Let us know that you are using the software": "Nos deixe saber como você está usando o software",
+ "Unable to load verification info": "Não foi possível carregar as informações de verificação",
+ "No Changes": "Nenhuma mudança",
+ "Page not fond": "Página não encontrada",
+ "Oops! Page not found.": "Opa! Página não encontrada",
+ "Family Registration": "Registro da Família",
+ "Please enter the following to start your family's verification": "Por favor, digite a informação a seguir para iniciar a verificação da sua família",
+ "email": "e-mail",
+ "Family Verification": "Verificação da Família",
+ "Family Member(s)": "Membro(s) da Família",
+ "Work Email": "E-mail de Trabalho",
+ "Age Hidden": "Idade Oculta",
+ "Please let us know what information to update if any": "Por favor, nos deixe saber quais informações atualizar se houver",
+ "Your verification request is complete": "Seu pedido de verificação está completo",
+ "We encountered an error submitting with your verification data": "Encontramos um erro ao enviar os seus dados de verificação",
+ "Visit our Site": "Visite nosso site",
+ "Request Family Info Verification": "Solicitar Confirmação de Informações da Família",
+ "Select how do you want to request the family information to be verified": "Selecione como deseja solicitar que as informações da família sejam verificadas",
+ "Online Verification": "Verificação On-line",
+ "PDF Report": "Relatório PDF",
+ "Verified In Person": "Verificada na Pessoa",
+ "None State": "Nenhum Estado",
+ "Unavailable person info inherited from assigned family for display?\\rThis option causes certain info from a person's assigned family record to be\\rdisplayed IF the corresponding info has NOT been entered for that person. ": "Informação de pessoa indisponível herdada da família atribuída para exibição?\\rEsta opção faz com que determinadas informações do registro familiar atribuído a uma pessoa sejam exibidas SE a informação correspondente NÃO tiver sido inserida para essa pessoa. ",
+ "Backup archive does not contain a database": "O arquivo de backup não contém um banco de dados",
+ "Unknown File Type": "Tipo de arquivo desconhecido",
+ "from file": "do arquivo",
+ "Missing Coordinates": "Faltam Coordenadas",
+ "Family Coordinates Data for Some Families": "Dados de coordenadas para algumas famílias",
+ "Make user-entered zip/postcodes UPPERCASE when saving to the database.": "Faça com que o usuário digite CEP/ Códigos Postais com MAIÚSCULAS ao salvar no banco de dados.",
+ "Used to end a letter before Signer": "Usado para terminar uma carta, antes da assinatura",
+ "Google Analytics Tracking Code": "Código de rastreio do Google Analytics",
+ "English - United States:en_US": "Inglês - Estados Unidos:en_US",
+ "English - Canada:en_CA": "Inglês - Canadá:en_CA",
+ "English - Australia:en_AU": "Inglês - Austrália:en_AU",
+ "English - Great Britain:en_GB": "Inglês - Grã Bretanha:en_GB",
+ "German - Germany:de_DE": "Alemão - Alemanha - Germany:de_DE",
+ "Spanish - Spain:es_ES": "Espanhol - Espanha:es_ES",
+ "French - France:fr_FR": "Francês - França:fr_FR",
+ "Hungarian:hu_HU": "Húngaro:hu_HU",
+ "Italian - Italy:it_IT": "Italiano - Itália:it_IT",
+ "Norwegian:nb_NO": "Norueguês:nb_NO",
+ "Dutch - Netherlands:nl_NL": "Holandês - Países Baixos:nl_NL",
+ "Polish:pl_PL": "Polonês:pl_PL",
+ "Portuguese - Brazil:pt_BR": "Português - Brasil:pt_BR",
+ "Romanian - Romania:ro_RO": "Romeno - Roménia:ro_RO",
+ "Russian:ru_RU": "Russo:ru_RU",
+ "Sami (Northern) (Sweden):se_SE": "Sami (Norte) (Suécia):se_SE",
+ "Albanian:sq_AL": "Albanês:sq_AL",
+ "Swedish - Sweden:sv_SE": "Sueco - Suécia:sv_SE",
+ "Vietnamese:vi_VN": "Vietnamita:vi_VN",
+ "Chinese - China:zh_CN": "Chinês - China:zh_CN",
+ "Chinese - Taiwan:zh_TW": "Chinês - Taiwan:zh_TW",
+ "Maximum upload size": "Tamanho Máximo para upload",
+ "The selected file exceeds this servers maximum upload size of": "O arquivo selecionado excede o tamanho máximo para upload deste servidor de",
+ "Unmet Application Prerequisites": "Pré-requisitos da aplicação não satisfeitos",
+ "All Application Prerequisites Satisfied": "Todos os pré-requisitos da aplicação foram satisfeitos",
+ "All components that ChurchCRM relies upon are present and correctly configured on this server": "Todos os componentes nos quais o ChurchCRM se baseia estão presentes e configurados corretamente neste servidor",
+ "Certain components that ChurchCRM relies upon are missing or improperly configured on this server. The application may continue to function, but may produce unexpected behavior.": "Alguns componentes sobre nos quais o ChurchCRM se baseia estão ausentes ou configurados incorretamente neste servidor. A aplicação pode continuar a funcionar, mas pode causar comportamentos inesperados.",
+ "Failed": "Falhou",
+ "The previous integrity check passed. All system file hashes match the expected values.": "A verificação de integridade anterior passou. Todos os hashes de arquivos de sistema correspondem aos valores esperados.",
+ "Google map API requires a unique key": "A API do Google Map requer uma chave única obtida em https://developers.google.com/maps/documentation/javascript/get-api-key",
+ "Church Checking Account Number": "Número da Conta de Verificação da Igreja",
+ "Missing Role Data for Some People": "Dado do papel perdido para algumas pessoas",
+ "PHP Max File size too small": "O tamanho máximo do arquivo para o PHP é muito pequeno",
+ "Increase the php upload limits to allow for mobile photo upload, and backup restore.": "Aumente os limites do upload do PHP para permitir o upload de foto de celular e restaurar o backup.",
+ "POST to cart requires a Persons array": "O POST para carrinho requer um array de pessoas",
+ "Deactivated the Family": "Família desativada",
+ "Activated the Family": "Família ativa",
+ "families": "Famílias",
+ "Deposit ticket type. QBDT - Quickbooks": "Tipo de ingresso de depósito. QBDT - Quickbooks",
+ "Financial Settings": "Configurações financeiras",
+ "An invalid configuration name has been requested": "Um nome de configuração inválido foi solicitado",
+ "An invalid configuration id has been requested": "Um ID de configuração inválido foi solicitado",
+ "Profile Image uploaded": "Imagem do Perfil Enviada",
+ "payments(s)?": "pagamento(s)?",
+ "Please ensure this what you want to do.
": "Por favor, assegure-se que é isso que você pretende fazer. P>",
+ " This Family is Deactivated": "Esta Família está Desativada",
+ " this Family": "esta família",
+ "Confirm Deactivation": "Confirme a Desativação",
+ "Confirm Activation": "Confirme a ativação",
+ "Please confirm deactivation of family": "Por favor, confirme a desativação da família",
+ "Please confirm activation of family": "Por favor, confirme a ativação da família",
+ "Show neighbors with these classifications:": "Mostre os vizinhos com estas classificações:",
+ "Please select a Family.": "Por favor, selecione a família",
+ "Coordinate data base file name:": "Nome do arquivo da base de dados de coordenadas:",
+ "Add To Cart": "Adicionar ao carrinho",
+ "Intersect With Cart": "Interseção com o carrinho",
+ "Remove From Cart": "Remova do carrinho",
+ "Family Member": "Membro da Família",
+ "select an option": "selecione uma opção",
+ "Direct me": "Me direcione",
+ "Your cart is empty": "O seu carrinho está vazio",
+ "Your cart has been successfully emptied": "O seu carrinho foi esvaziado com sucesso",
+ "The record could not be found.": "O registro não pôde ser encontrado.",
+ "The property is already assigned.": "A propriedade já está atribuída.",
+ "The property is successfully assigned.": "A propriedade foi atribuída com sucesso.",
+ "The property could not be assigned.": "A propriedade não pôde ser atribuída.",
+ "The property is successfully unassigned.": "A propriedade foi desatribuída com sucesso.",
+ "The property could not be unassigned.": "A propriedade não pôde ser desatribuída.",
+ "Select event": "Selecionar evento",
+ "Person's Name": "Nome da Pessoa",
+ "Adult Name(Optional)": "Nome adulto (Opcional)",
+ "Checked in By(Optional)": "Inscrito por (Opcional)",
+ "Person has been already checked in for this event": "A pessoa já fez check-in para este evento",
+ "CheckOut Person": "Pessoas que fizeram Check-out",
+ "Delete Checkin in Entry": "Deletar entrada de check-in",
+ "Adult Checking Out Person": "Pessoas adultas realizando o check-out",
+ "Adult Name (Optional)": "Nome adulto (Opcional)",
+ "Text before name in emails/reports": "Texto antes do nome nos e-mails /relatórios",
+ "Set true to allow empty lastname in Person Editor. Set false to validate last name and inherit from family when left empty.": "Selecione verdadeiro para permitir o sobrenome vazio no editor de pessoas. Selecione falso para validar o sobrenome e herdar da família quando deixado vazio.",
+ "Display bill counts on deposit slip": "Exibir conta conta no comprovante de depósito",
+ "ChurchCRM Cloud Access URL": "URL de Acesso à Nuvem ChurchCRM",
+ "Your Account was Deleted": "Sua conta foi deletada.",
+ "Your ChurchCRM Account was Deleted.": "A sua conta ChurchCRM foi deletada.",
+ "Account Locked": "Conta bloqueada",
+ "Your New Account": "Sua nova conta",
+ "Password Changed": "Senha Alterada",
+ "Password Reset": "Senha Resetada",
+ "Account Unlocked": "Conta desbloqueada",
+ "Part": "Parte",
+ "View Photo": "Ver foto",
+ "Family Photo": "Foto da Família",
+ "Quick Settings": "Configurações rápidas",
+ "Status": "Estado",
+ "Email export": "Exportar e-mail",
+ "Include": "Incluir",
+ "Exclude": "Excluir",
+ "No property assignments": "Sem propriedades atribuídas",
+ "View Cart": "Ver carrinho",
+ "Your Cart is Empty": "Seu carrinho está vazio",
+ "View on Map": "Ver no Mapa",
+ "Legend": "Legenda",
+ "assigned": "Assinatura",
+ "Photo": "Foto",
+ "Payment Details": "Detalhes do Pagamento",
+ "Fund Split": "Divisão do fundo",
+ "Showing students with birthdays in": "Mostrando alunos com aniversários em",
+ "Actions": "Ações",
+ "Action Confirmation": "Ação de confirmação",
+ "Please confirm reset failed login count": "Confirme a contagem de login com falha de reset",
+ "Password reset for": "Senha resetada para",
+ "View Active Families": "Ver família ativas",
+ "View Inactive Families": "Ver família inativas",
+ "SMTP Server timeout in sec": "Timeout do servidor SMTP",
+ "Exclude Inactive Families": "Excluir Família Inativas",
+ "The role is already assigned.": "O papel já está atribuído.",
+ "The role is successfully assigned.": "O papel foi atribuído com sucesso.",
+ "The role could not be assigned.": "O papel não pôde ser atribuído.",
+ "Bing map API requires a unique key": "A API do mapa do Bing requer uma chave única.",
+ "Google Maps Zoom": "Zoom do Google Maps",
+ "Select GeoCoder Provider": "Selecione o ser provedor de GeoCode",
+ "Your ChurchCRM account was locked.": "A sua conta do churchCRM foi bloqueada.",
+ "A ChurchCRM account was created for you": "Um conta do ChurchCRM foi criada para você",
+ "Your ChurchCRM password was changed": "A sua senha do ChurchCRM foi alterada",
+ "You can reset your ChurchCRM password by clicking this link": "Você pode reinicializar a sua senha do churchCRM clicando neste link.",
+ "Your ChurchCRM account was unlocked.": "A sua conta do churchCRM foi desbloqueada.",
+ "system user created": "usuário do sistema criado",
+ "system user updated": "usuário do sistema atualizado",
+ "system user deleted": "usuário do sistema excluído",
+ "system user password reset": "Reinicializar a senha de usuário do sistema",
+ "system user changed password": "senha do usuário do sistema mudada",
+ "system user password changed by admin": "senha do usuário do sistema alterada pelo administrador",
+ "system user login reset": "Login do usuário do sistema reinicializado",
+ "Missing Families? Update Family Latitude or Longitude now.": "Família Perdidas? Atualize a latitude ou a longitude agora.",
+ "Families without Geo Info": "Família sem informações geográficas",
+ "Notification for": "Notificação para",
+ "DEBUG": "DEBUG",
+ "INFO": "INFORMAÇÃO",
+ "NOTICE": "NOTA",
+ "WARNING": "AVISO",
+ "ERROR": "ERRO",
+ "CRITICAL": "CRÍTICO",
+ "ALERT": "ALERTA",
+ "EMERGENCY": "EMERGÊNCIA",
+ "Title FirstName MiddleName LastName": "Título Primeiro Nome Nome do Meio Último Nome",
+ "Title FirstName MiddleInitial. LastName": "Título Primeiro Nome Nome do Meio. Último Nome",
+ "LastName, Title FirstName MiddleName": " Último Nome, Título Primeiro Nome Nome do Meio",
+ "LastName, Title FirstName MiddleInitial": " Último Nome, Título Primeiro Nome Inicial do Nome do Meio",
+ "FirstName MiddleName LastName": "Primeiro Nome Nome do Meio Último Nome",
+ "Title FirstName LastName": "Título Primeiro Nome Último Nome",
+ "LastName, Title FirstName": "Último Nome, Título Primeiro Nome",
+ "Event Log severity to write, used by ORM and App Logs": "Severidade do Log do evento a ser escrito, usado pelo ORM e Logs de App.",
+ "Time zone": "Zona de Tempo",
+ "Nexmo SMS API Key": "Chave API do NEXMO SMS",
+ "Nexmo SMS API Secret": "Senha API do NEXMO SMS",
+ "Nexmo SMS From Number": "Número \"De\" do Nexmo SMS",
+ "OpenLP URL": "URL do OpenLP",
+ "OpenLP Username": "Usuário do OpenLP",
+ "OpenLP Password": "Senha do OpenLP",
+ "KioskVisibilityTimestamp": "Visibilidade da Hora no Quiosque",
+ "Show/Hide Lost Password Link on the login screen": "Mostrar/Esconder Link da senha perdida na tela de login",
+ "Backup": "Bacape",
+ "Integration": "Integração",
+ "Notification": "Notificação",
+ "Guardian(s) of": "Responsável por",
+ "A notification was triggered by the classroom teacher at": "Uma notificação foi desencadeada pelo professor da sala de aula em",
+ "Please go to this location": "Por favor, vá para esta localização",
+ "You ChurchCRM updated password has been changed": "A sua senha do ChurchCRM foi mudada.",
+ "Password Reset Link": "Link de resete da senha",
+ "Reset Password": "resetar a senha",
+ "As part of the restore, external backups have been disabled. If you wish to continue automatic backups, you must manuall re-enable the bEnableExternalBackupTarget setting.": "Como parte da recuperação, becapes externos ",
+ "Event Group": "Grupo do Evento",
+ "Unable to reset password": "Impossível resetar a sua senha",
+ "Reset your password": "Resetar a sua senha",
+ "Check your email for a password reset link": "Verifique o link de resete da senha no seu e-mail",
+ "Sorry, we are unable to process your request at this point in time.": "Desculpe, não podemos processar seu pedido neste momento.",
+ "Login Name is Required": "Nome de usuário solicitado",
+ "A new password was sent to you. Please check your email": "Uma nova senha foi enviada para você. Por favor cheque seu e-mail.",
+ "Kiosk Manager": "Gerenciador de quiosque",
+ "Your Cart": "Seu carrinho",
+ "Your settings and more": "Suas configurações e mais",
+ "Read the docs": "Leia os documentos",
+ "Report an issue": "Reportar uma questão",
+ "Log off": "Sair",
+ "Your tasks": "Suas tarefas",
+ "Enable New Kiosk Registration": "Abilitar o requistro de um novo quiosque",
+ "Active Kiosks": "Quiosques ativo",
+ "I forgot my password": "Eu esqueci a minha senha",
+ "Attendees Checked In": "Participantes Checados",
+ " family": " família",
+ "Bank Draft ": "Cheque Administrativo ",
+ "Credit Card ": "Cartão de Crédito ",
+ "Disable ": "Desabilitado ",
+ "Store Private Data at Vanco": "Armazenar dados Privativos no Vanco",
+ "Cart Functions": "Funções do Carrinho",
+ "Text Cart": "Texto do Carrinho",
+ "Your Church's Website": "O Website da Sua Igreja",
+ "Self Verification": "Autoverificação",
+ "Deactivate": "Desativar",
+ "Activate": "Ativar"
+}
diff --git a/src/locale/ro_RO/LC_MESSAGES/messages.js b/locale/JSONKeys/ro_RO.json
similarity index 100%
rename from src/locale/ro_RO/LC_MESSAGES/messages.js
rename to locale/JSONKeys/ro_RO.json
diff --git a/src/locale/ru_RU/LC_MESSAGES/messages.js b/locale/JSONKeys/ru_RU.json
similarity index 100%
rename from src/locale/ru_RU/LC_MESSAGES/messages.js
rename to locale/JSONKeys/ru_RU.json
diff --git a/src/locale/sq_AL/LC_MESSAGES/messages.js b/locale/JSONKeys/sq_AL.json
similarity index 100%
rename from src/locale/sq_AL/LC_MESSAGES/messages.js
rename to locale/JSONKeys/sq_AL.json
diff --git a/src/locale/sv_SE/LC_MESSAGES/messages.js b/locale/JSONKeys/sv_SE.json
similarity index 100%
rename from src/locale/sv_SE/LC_MESSAGES/messages.js
rename to locale/JSONKeys/sv_SE.json
diff --git a/src/locale/vi_VN/LC_MESSAGES/messages.js b/locale/JSONKeys/vi_VN.json
similarity index 99%
rename from src/locale/vi_VN/LC_MESSAGES/messages.js
rename to locale/JSONKeys/vi_VN.json
index eee5a63690..2a9934e7a1 100644
--- a/src/locale/vi_VN/LC_MESSAGES/messages.js
+++ b/locale/JSONKeys/vi_VN.json
@@ -430,7 +430,6 @@
"Add New Person": "Thêm thành viên mới",
"View All Persons": "Xem tất cả thành viên",
"Add New Family": "Thêm gia đình mới",
- "View All Families": "Xem tất cả gia đình",
"Events": "Sự kiện",
"Email Export": "Email xuất ra",
"Deposit(s)": "Tiền ký gửi",
@@ -477,6 +476,8 @@
"Quick Settings": "Cài đặt nhanh",
"Status": "Trạng thái",
"Email export": "Email xuất ra",
+ "View Active Families": "Xem gia đình đang hoạt động",
+ "View Inactive Families": "Xem gia đình không hoạt động",
"Exclude Inactive Families": "Ngoại trừ gia đình không hoạt động",
"system user password changed by admin": "mật khẩu thành viên đã được thay đổi bởi Admin"
-}
+}
\ No newline at end of file
diff --git a/src/locale/zh_CN/LC_MESSAGES/messages.js b/locale/JSONKeys/zh_CN.json
similarity index 100%
rename from src/locale/zh_CN/LC_MESSAGES/messages.js
rename to locale/JSONKeys/zh_CN.json
diff --git a/src/locale/zh_TW/LC_MESSAGES/messages.js b/locale/JSONKeys/zh_TW.json
similarity index 100%
rename from src/locale/zh_TW/LC_MESSAGES/messages.js
rename to locale/JSONKeys/zh_TW.json
diff --git a/locale/messages.po b/locale/messages.po
index 7835e7e66d..81a81df7c2 100644
--- a/locale/messages.po
+++ b/locale/messages.po
@@ -1,3 +1,4 @@
+# #-#-#-#-# messages.po (PACKAGE VERSION) #-#-#-#-#
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
@@ -6,9 +7,14 @@
#, fuzzy
msgid ""
msgstr ""
+"#-#-#-#-# messages.po (PACKAGE VERSION) #-#-#-#-#\n"
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
+<<<<<<< HEAD
"POT-Creation-Date: 2017-07-02 21:51+0000\n"
+=======
+"POT-Creation-Date: 2017-07-09 19:57+0000\n"
+>>>>>>> master
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -16,6 +22,14 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-# js-strings.po (i18next-conv) #-#-#-#-#\n"
+"Project-Id-Version: i18next-conv\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"POT-Creation-Date: 2017-07-09T19:57:44.889Z\n"
+"PO-Revision-Date: 2017-07-09T19:57:44.890Z\n"
#: api/routes/cart.php:13
msgid "POST to cart requires a Persons array"
@@ -96,22 +110,38 @@ msgstr ""
#: DepositSlipEditor.php:232 DonationFundEditor.php:156
#: DonationFundEditor.php:186 EditEventAttendees.php:76
#: ElectronicPaymentList.php:222 ElectronicPaymentList.php:288
+<<<<<<< HEAD
#: EventNames.php:305 FamilyCustomFieldsEditor.php:334
#: FamilyCustomFieldsEditor.php:392 FamilyView.php:645 FamilyView.php:697
#: FamilyView.php:755 FamilyView.php:892 FindDepositSlip.php:108
#: FundRaiserEditor.php:204 ListEvents.php:250 PaddleNumList.php:60
#: PersonCustomFieldsEditor.php:318 PersonCustomFieldsEditor.php:387
+=======
+#: EventNames.php:305 FamilyCustomFieldsEditor.php:335
+#: FamilyCustomFieldsEditor.php:393 FamilyView.php:661 FamilyView.php:713
+#: FamilyView.php:772 FamilyView.php:909 FindDepositSlip.php:108
+#: FundRaiserEditor.php:204 ListEvents.php:250 PaddleNumList.php:60
+#: PersonCustomFieldsEditor.php:319 PersonCustomFieldsEditor.php:388
+>>>>>>> master
#: PersonView.php:908 PledgeDelete.php:57 PropertyList.php:69
#: PropertyList.php:110 PropertyTypeList.php:44 PropertyTypeList.php:65
#: PropertyTypeList.php:67
msgid "Delete"
msgstr ""
+<<<<<<< HEAD
#: AutoPaymentDelete.php:68 AutoPaymentEditor.php:583 BatchWinnerEntry.php:116
#: CanvassEditor.php:243 Checkin.php:172 Checkin.php:281 Checkin.php:294
#: DirectoryReports.php:290 DonatedItemEditor.php:300 EventNames.php:234
#: external/templates/verify/verify-family-info.php:139 FamilyEditor.php:1125
#: FamilyView.php:891 FinancialReports.php:72 FundRaiserEditor.php:147
+=======
+#: AutoPaymentDelete.php:68 AutoPaymentEditor.php:791 BatchWinnerEntry.php:116
+#: CanvassEditor.php:243 Checkin.php:172 Checkin.php:281 Checkin.php:294
+#: DirectoryReports.php:290 DonatedItemEditor.php:300 EventNames.php:234
+#: external/templates/verify/verify-family-info.php:149 FamilyEditor.php:1125
+#: FamilyView.php:908 FinancialReports.php:72 FundRaiserEditor.php:147
+>>>>>>> master
#: GroupPropsEditor.php:172 GroupReports.php:87 GroupReports.php:156
#: LettersAndLabels.php:77 ManageEnvelopes.php:139 MemberRoleChange.php:123
#: MemberRoleChange.php:125 NoteDelete.php:71 NoteEditor.php:139
@@ -119,17 +149,33 @@ msgstr ""
#: PropertyEditor.php:173 PropertyTypeEditor.php:118 Register.php:60
#: ReminderReport.php:56 SettingsIndividual.php:123 SettingsIndividual.php:169
#: SettingsUser.php:111 SettingsUser.php:171
+<<<<<<< HEAD
#: sundayschool/SundaySchoolDashboard.php:237
+=======
+#: sundayschool/SundaySchoolDashboard.php:249
+>>>>>>> master
#: sundayschool/SundaySchoolReports.php:231 TaxReport.php:54
#: UserEditor.php:475 UserEditor.php:578 WhyCameEditor.php:104
msgid "Cancel"
msgstr ""
+<<<<<<< HEAD
#: AutoPaymentEditor.php:131
msgid "Automatic payment configuration for the "
msgstr ""
#: AutoPaymentEditor.php:582 CanvassEditor.php:242 DepositSlipEditor.php:98
+=======
+#: AutoPaymentEditor.php:133
+msgid "Automatic payment configuration for the "
+msgstr ""
+
+#: AutoPaymentEditor.php:133
+msgid " family"
+msgstr ""
+
+#: AutoPaymentEditor.php:790 CanvassEditor.php:242 DepositSlipEditor.php:98
+>>>>>>> master
#: DonatedItemEditor.php:296 FamilyEditor.php:653 FamilyEditor.php:737
#: FamilyEditor.php:801 FamilyEditor.php:875 FamilyEditor.php:897
#: FamilyEditor.php:928 FamilyEditor.php:1121 FundRaiserEditor.php:146
@@ -142,11 +188,19 @@ msgstr ""
msgid "Save"
msgstr ""
+<<<<<<< HEAD
#: AutoPaymentEditor.php:596
#: ChurchCRM/Emails/verify/FamilyVerificationEmail.php:24
#: ElectronicPaymentList.php:198
#: external/templates/registration/family-register-done.php:28
#: FamilyView.php:208 FinancialReports.php:306 Include/Footer.php:58
+=======
+#: AutoPaymentEditor.php:805
+#: ChurchCRM/Emails/verify/FamilyVerificationEmail.php:24
+#: ElectronicPaymentList.php:198
+#: external/templates/registration/family-register-done.php:28
+#: FamilyView.php:212 FinancialReports.php:306 Include/Footer.php:58
+>>>>>>> master
#: PersonEditor.php:758 PersonView.php:380 PledgeEditor.php:511
#: PrintView.php:243 PropertyAssign.php:77 PropertyEditor.php:47
#: PropertyList.php:32 PropertyTypeEditor.php:94 PropertyTypeList.php:60
@@ -154,11 +208,19 @@ msgstr ""
msgid "Family"
msgstr ""
+<<<<<<< HEAD
#: AutoPaymentEditor.php:599 BatchWinnerEntry.php:87 BatchWinnerEntry.php:99
#: CSVImport.php:275 DonatedItemEditor.php:189 DonatedItemEditor.php:240
#: eGive.php:341 FamilyEditor.php:1095 GroupEditor.php:91
#: Include/CountryDropDown.php:6 Include/Functions.php:1074
#: Include/Functions.php:1122 MapUsingGoogle.php:98 MapUsingGoogle.php:122
+=======
+#: AutoPaymentEditor.php:808 BatchWinnerEntry.php:87 BatchWinnerEntry.php:99
+#: CSVImport.php:275 DonatedItemEditor.php:189 DonatedItemEditor.php:240
+#: eGive.php:341 FamilyEditor.php:1095 GroupEditor.php:91
+#: Include/CountryDropDown.php:6 Include/Functions.php:1074
+#: Include/Functions.php:1127 MapUsingGoogle.php:98 MapUsingGoogle.php:122
+>>>>>>> master
#: PaddleNumEditor.php:180 PersonEditor.php:744 PersonEditor.php:760
#: PersonEditor.php:1045 PrintView.php:249 PrintView.php:259
#: SelectDelete.php:155 SelectList.php:44 SelectList.php:54 SelectList.php:70
@@ -166,23 +228,49 @@ msgstr ""
msgid "Unassigned"
msgstr ""
+<<<<<<< HEAD
#: AutoPaymentEditor.php:619
msgid "Automatic payment type"
msgstr ""
#: AutoPaymentEditor.php:632 CanvassEditor.php:198 DepositSlipEditor.php:82
#: EditEventAttendees.php:33 FamilyView.php:748 FindFundRaiser.php:241
+=======
+#: AutoPaymentEditor.php:828
+msgid "Automatic payment type"
+msgstr ""
+
+#: AutoPaymentEditor.php:832
+msgid "Bank Draft "
+msgstr ""
+
+#: AutoPaymentEditor.php:836
+msgid "Credit Card "
+msgstr ""
+
+#: AutoPaymentEditor.php:840
+msgid "Disable "
+msgstr ""
+
+#: AutoPaymentEditor.php:844 CanvassEditor.php:198 DepositSlipEditor.php:82
+#: EditEventAttendees.php:33 FamilyView.php:765 FindFundRaiser.php:241
+>>>>>>> master
#: FundRaiserEditor.php:168 Include/Functions.php:101 PledgeEditor.php:521
#: SelectDelete.php:217
msgid "Date"
msgstr ""
+<<<<<<< HEAD
#: AutoPaymentEditor.php:637 ElectronicPaymentList.php:200 FamilyView.php:747
+=======
+#: AutoPaymentEditor.php:851 ElectronicPaymentList.php:200 FamilyView.php:764
+>>>>>>> master
#: PledgeEditor.php:523 ReminderReport.php:46 SelectDelete.php:216
#: sundayschool/SundaySchoolReports.php:161 queryparameters_qrp.php:18
msgid "Fiscal Year"
msgstr ""
+<<<<<<< HEAD
#: AutoPaymentEditor.php:644
msgid "Payment amount"
msgstr ""
@@ -197,12 +285,29 @@ msgid "Fund"
msgstr ""
#: AutoPaymentEditor.php:657 CartToGroup.php:80 EditEventTypes.php:91
+=======
+#: AutoPaymentEditor.php:858
+msgid "Payment amount"
+msgstr ""
+
+#: AutoPaymentEditor.php:863
+msgid "Payment interval (months)"
+msgstr ""
+
+#: AutoPaymentEditor.php:868 ElectronicPaymentList.php:204 FamilyView.php:659
+#: FamilyView.php:763 FinancialReports.php:305 SelectDelete.php:215
+msgid "Fund"
+msgstr ""
+
+#: AutoPaymentEditor.php:871 CartToGroup.php:80 EditEventTypes.php:91
+>>>>>>> master
#: EditEventTypes.php:103 EventNames.php:109 EventNames.php:121
#: EventNames.php:166 GroupReports.php:52 GroupReports.php:147
#: PersonToGroup.php:70 sundayschool/SundaySchoolReports.php:147
msgid "None"
msgstr ""
+<<<<<<< HEAD
#: AutoPaymentEditor.php:670
msgid "inactive"
msgstr ""
@@ -223,32 +328,71 @@ msgstr ""
#: AutoPaymentEditor.php:690 AutoPaymentEditor.php:695 CartToFamily.php:239
#: CartToFamily.php:244 CartView.php:287 CSVExport.php:105 CSVExport.php:110
+=======
+#: AutoPaymentEditor.php:884
+msgid "inactive"
+msgstr ""
+
+#: AutoPaymentEditor.php:894 CSVExport.php:90 CSVImport.php:215
+#: external/templates/registration/family-register-members.php:69
+#: external/templates/verify/enter-info.php:21 PersonEditor.php:608
+#: sundayschool/SundaySchoolDashboard.php:193
+msgid "First Name"
+msgstr ""
+
+#: AutoPaymentEditor.php:900 CSVExport.php:79 CSVImport.php:217
+#: external/templates/registration/family-register-members.php:73
+#: external/templates/verify/enter-info.php:25 ManageEnvelopes.php:166
+#: PersonEditor.php:630 sundayschool/SundaySchoolDashboard.php:194
+msgid "Last Name"
+msgstr ""
+
+#: AutoPaymentEditor.php:906 AutoPaymentEditor.php:912 CartToFamily.php:239
+#: CartToFamily.php:244 CartView.php:295 CSVExport.php:105 CSVExport.php:110
+>>>>>>> master
#: CSVImport.php:221 CSVImport.php:222 DirectoryReports.php:176
#: DirectoryReports.php:250
#: external/templates/registration/family-register-done.php:29
#: external/templates/registration/family-register.php:35 FamilyEditor.php:670
+<<<<<<< HEAD
#: FamilyEditor.php:674 FamilyList.php:44 FamilyView.php:217 GeoPage.php:386
#: GroupReports.php:128 Menu.php:204 Menu.php:239 PersonEditor.php:793
+=======
+#: FamilyEditor.php:674 FamilyList.php:44 FamilyView.php:221 GeoPage.php:386
+#: GroupReports.php:128 Menu.php:210 Menu.php:251 PersonEditor.php:793
+>>>>>>> master
#: PersonEditor.php:809 PersonView.php:270 Register.php:47
#: Reports/ConfirmReportEmail.php:124 Reports/ConfirmReportEmail.php:129
msgid "Address"
msgstr ""
+<<<<<<< HEAD
#: AutoPaymentEditor.php:700 CartToFamily.php:249 CSVExport.php:115
+=======
+#: AutoPaymentEditor.php:918 CartToFamily.php:249 CSVExport.php:115
+>>>>>>> master
#: CSVImport.php:223 DirectoryReports.php:254
#: external/templates/registration/family-register.php:41 FamilyEditor.php:678
#: PersonEditor.php:825 Register.php:48 queryparameteroptions_qpo.php:7
msgid "City"
msgstr ""
+<<<<<<< HEAD
#: AutoPaymentEditor.php:705 CartToFamily.php:254 CSVExport.php:120
+=======
+#: AutoPaymentEditor.php:923 CartToFamily.php:254 CSVExport.php:120
+>>>>>>> master
#: CSVImport.php:224 DirectoryReports.php:258
#: external/templates/registration/family-register.php:44 FamilyEditor.php:685
#: PersonEditor.php:845 Register.php:49 queryparameteroptions_qpo.php:6
msgid "State"
msgstr ""
+<<<<<<< HEAD
#: AutoPaymentEditor.php:710 BackupDatabase.php:67 CartToFamily.php:266
+=======
+#: AutoPaymentEditor.php:929 BackupDatabase.php:67 CartToFamily.php:266
+>>>>>>> master
#: CSVExport.php:125 CSVImport.php:225 DirectoryReports.php:262
#: external/templates/registration/family-register.php:51
#: external/templates/verify/enter-info.php:29 FamilyEditor.php:695
@@ -256,12 +400,20 @@ msgstr ""
msgid "Zip"
msgstr ""
+<<<<<<< HEAD
#: AutoPaymentEditor.php:715 CartToFamily.php:274 CSVExport.php:135
+=======
+#: AutoPaymentEditor.php:934 CartToFamily.php:274 CSVExport.php:135
+>>>>>>> master
#: CSVImport.php:226 FamilyEditor.php:705 PersonEditor.php:890 Register.php:51
msgid "Country"
msgstr ""
+<<<<<<< HEAD
#: AutoPaymentEditor.php:720 ChurchCRM/Reports/PDF_Directory.php:312
+=======
+#: AutoPaymentEditor.php:940 ChurchCRM/Reports/PDF_Directory.php:312
+>>>>>>> master
#: ChurchCRM/Reports/PDF_Directory.php:386
#: ChurchCRM/Reports/PDF_Directory.php:443 DirectoryReports.php:266
#: external/templates/registration/family-register-members.php:103
@@ -269,30 +421,48 @@ msgstr ""
msgid "Phone"
msgstr ""
+<<<<<<< HEAD
#: AutoPaymentEditor.php:725 CartToFamily.php:315 CartView.php:288
+=======
+#: AutoPaymentEditor.php:946 CartToFamily.php:315 CartView.php:296
+>>>>>>> master
#: ChurchCRM/Reports/PDF_Directory.php:321
#: ChurchCRM/Reports/PDF_Directory.php:397
#: ChurchCRM/Reports/PDF_Directory.php:454 CSVExport.php:155 CSVImport.php:230
#: EditEventAttendees.php:42 EventAttendance.php:181
#: external/templates/registration/family-register-members.php:83
+<<<<<<< HEAD
#: external/templates/verify/verify-family-info.php:73 FamilyEditor.php:777
#: FamilyView.php:273 FamilyView.php:277 FamilyView.php:360
+=======
+#: external/templates/verify/verify-family-info.php:81 FamilyEditor.php:777
+#: FamilyView.php:279 FamilyView.php:284 FamilyView.php:367
+>>>>>>> master
#: GroupReports.php:132 PersonEditor.php:997 PersonEditor.php:999
#: PersonView.php:304 PersonView.php:463 PrintView.php:279
#: Reports/CanvassReports.php:247 Reports/ConfirmReportEmail.php:190
#: Reports/ConfirmReportEmail.php:208 Reports/ConfirmReport.php:188
#: Reports/ConfirmReport.php:207 Reports/DirectoryReport.php:299
#: Reports/GroupReport.php:138 sundayschool/SundaySchoolClassView.php:88
+<<<<<<< HEAD
#: sundayschool/SundaySchoolClassView.php:202 menuconfig_mcf.php:14
+=======
+#: sundayschool/SundaySchoolClassView.php:202 menuconfig_mcf.php:15
+>>>>>>> master
#: queryparameteroptions_qpo.php:13
msgid "Email"
msgstr ""
+<<<<<<< HEAD
#: AutoPaymentEditor.php:730 ElectronicPaymentList.php:213
+=======
+#: AutoPaymentEditor.php:952 ElectronicPaymentList.php:213
+>>>>>>> master
#: FinancialReports.php:267 FindDepositSlip.php:52 PledgeEditor.php:592
msgid "Credit Card"
msgstr ""
+<<<<<<< HEAD
#: AutoPaymentEditor.php:737
msgid "Vanco Credit Card Method"
msgstr ""
@@ -321,6 +491,40 @@ msgstr ""
msgid "Vanco Bank Account Method"
msgstr ""
+=======
+#: AutoPaymentEditor.php:960
+msgid "Vanco Credit Card Method"
+msgstr ""
+
+#: AutoPaymentEditor.php:969
+msgid "Expiration Month"
+msgstr ""
+
+#: AutoPaymentEditor.php:975
+msgid "Expiration Year"
+msgstr ""
+
+#: AutoPaymentEditor.php:981
+msgid "Bank Name"
+msgstr ""
+
+#: AutoPaymentEditor.php:987
+msgid "Bank Route Number"
+msgstr ""
+
+#: AutoPaymentEditor.php:993
+msgid "Bank Account Number"
+msgstr ""
+
+#: AutoPaymentEditor.php:1001
+msgid "Vanco Bank Account Method"
+msgstr ""
+
+#: AutoPaymentEditor.php:1018
+msgid "Store Private Data at Vanco"
+msgstr ""
+
+>>>>>>> master
#: BackupDatabase.php:45 Include/Footer.php:183
msgid "Backup Database"
msgstr ""
@@ -376,7 +580,11 @@ msgstr ""
msgid "Encrypt backup file with a password?"
msgstr ""
+<<<<<<< HEAD
#: BackupDatabase.php:76 Login.php:187 UserList.php:56
+=======
+#: BackupDatabase.php:76 Login.php:184 UserList.php:56
+>>>>>>> master
msgid "Password"
msgstr ""
@@ -640,6 +848,7 @@ msgstr ""
msgid "Add Cart to Family"
msgstr ""
+<<<<<<< HEAD
#: CartToFamily.php:159 CartView.php:286 Checkin.php:318
#: DonationFundEditor.php:153 DonationFundEditor.php:216
#: EditEventAttendees.php:32 EditEventAttendees.php:41 EventAttendance.php:180
@@ -648,6 +857,16 @@ msgstr ""
#: GeoPage.php:385 GroupEditor.php:77 GroupPropsFormEditor.php:284
#: GroupPropsFormEditor.php:396 GroupView.php:321 GroupView.php:355
#: PersonCustomFieldsEditor.php:314 PersonCustomFieldsEditor.php:445
+=======
+#: CartToFamily.php:159 CartView.php:294 Checkin.php:318
+#: DonationFundEditor.php:153 DonationFundEditor.php:216
+#: EditEventAttendees.php:32 EditEventAttendees.php:41 EventAttendance.php:180
+#: EventNames.php:266 FamilyCustomFieldsEditor.php:331
+#: FamilyCustomFieldsEditor.php:445 FamilyList.php:43 FamilyView.php:548
+#: GeoPage.php:385 GroupEditor.php:77 GroupPropsFormEditor.php:285
+#: GroupPropsFormEditor.php:397 GroupView.php:321 GroupView.php:355
+#: PersonCustomFieldsEditor.php:315 PersonCustomFieldsEditor.php:446
+>>>>>>> master
#: PersonView.php:654 PersonView.php:756 PrintView.php:322 PrintView.php:450
#: PropertyEditor.php:153 PropertyList.php:64 PropertyTypeEditor.php:100
#: PropertyTypeList.php:39 Reports/CanvassReports.php:73
@@ -680,15 +899,24 @@ msgid "If adding a new family, enter data below."
msgstr ""
#: CartToFamily.php:210 external/templates/registration/family-register.php:31
+<<<<<<< HEAD
#: FamilyEditor.php:660 Menu.php:203 Menu.php:238
+=======
+#: FamilyEditor.php:660 Menu.php:209 Menu.php:250
+>>>>>>> master
#: Reports/ConfirmReportEmail.php:119 Reports/ConfirmReport.php:120
#: SelectDelete.php:151 SelectDelete.php:277
msgid "Family Name"
msgstr ""
#: CartToFamily.php:215 CSVImport.php:234 DirectoryReports.php:177
+<<<<<<< HEAD
#: external/templates/verify/verify-family-info.php:31 FamilyEditor.php:811
#: FamilyView.php:243
+=======
+#: external/templates/verify/verify-family-info.php:35 FamilyEditor.php:811
+#: FamilyView.php:248
+>>>>>>> master
msgid "Wedding Date"
msgstr ""
@@ -708,9 +936,15 @@ msgstr ""
#: EditEventAttendees.php:43 EventAttendance.php:182
#: external/templates/registration/family-register-done.php:30
#: external/templates/registration/family-register.php:68
+<<<<<<< HEAD
#: external/templates/verify/verify-family-info.php:26
#: external/templates/verify/verify-family-info.php:70 FamilyEditor.php:743
#: FamilyList.php:45 FamilyView.php:255 GroupReports.php:129
+=======
+#: external/templates/verify/verify-family-info.php:28
+#: external/templates/verify/verify-family-info.php:75 FamilyEditor.php:743
+#: FamilyList.php:45 FamilyView.php:261 GroupReports.php:129
+>>>>>>> master
#: PersonEditor.php:923 PersonEditor.php:925 PersonView.php:299
#: PrintView.php:184 Reports/ConfirmReportEmail.php:139
#: Reports/ConfirmReport.php:140 SelectList.php:986 SelectList.php:987
@@ -721,14 +955,23 @@ msgstr ""
#: CartToFamily.php:290 CartToFamily.php:300 CartToFamily.php:310
#: FamilyEditor.php:751 FamilyEditor.php:761 FamilyEditor.php:771
+<<<<<<< HEAD
#: Include/Functions.php:1113 PersonEditor.php:939 PersonEditor.php:963
+=======
+#: Include/Functions.php:1117 PersonEditor.php:939 PersonEditor.php:963
+>>>>>>> master
#: PersonEditor.php:987
msgid "Do not auto-format"
msgstr ""
#: CartToFamily.php:295 CSVExport.php:145 CSVImport.php:228
+<<<<<<< HEAD
#: external/templates/verify/verify-family-info.php:71 FamilyEditor.php:755
#: FamilyView.php:261 GroupReports.php:130 PersonEditor.php:946
+=======
+#: external/templates/verify/verify-family-info.php:77 FamilyEditor.php:755
+#: FamilyView.php:267 GroupReports.php:130 PersonEditor.php:946
+>>>>>>> master
#: PersonEditor.php:948 PersonView.php:313 PrintView.php:189
#: Reports/ConfirmReportEmail.php:237 Reports/ConfirmReport.php:244
#: SelectList.php:989 SelectList.php:990 SelectList.php:1062
@@ -736,8 +979,13 @@ msgid "Work Phone"
msgstr ""
#: CartToFamily.php:305 CSVExport.php:150 CSVImport.php:229
+<<<<<<< HEAD
#: external/templates/verify/verify-family-info.php:72 FamilyEditor.php:765
#: FamilyView.php:267 PersonEditor.php:971 PersonEditor.php:973
+=======
+#: external/templates/verify/verify-family-info.php:79 FamilyEditor.php:765
+#: FamilyView.php:273 PersonEditor.php:971 PersonEditor.php:973
+>>>>>>> master
#: PersonView.php:294 PrintView.php:194 SelectList.php:992 SelectList.php:993
#: SelectList.php:1062
msgid "Mobile Phone"
@@ -773,14 +1021,15 @@ msgstr ""
msgid "Create a New Group"
msgstr ""
-#: CartView.php:42
+#: CartView.php:41
msgid "View Your Cart"
msgstr ""
-#: CartView.php:50
+#: CartView.php:49
msgid "You have no items in your cart."
msgstr ""
+<<<<<<< HEAD
#: CartView.php:59
msgid "Back to Menu"
msgstr ""
@@ -789,10 +1038,25 @@ msgstr ""
msgid "Go To Labels"
msgstr ""
+=======
+#: CartView.php:58
+msgid "Back to Menu"
+msgstr ""
+
+#: CartView.php:93
+msgid "Go To Labels"
+msgstr ""
+
+#: CartView.php:106
+msgid "Cart Functions"
+msgstr ""
+
+>>>>>>> master
#: CartView.php:110 Include/Header.php:126
msgid "Empty Cart"
msgstr ""
+<<<<<<< HEAD
#: CartView.php:113 Include/Header.php:131
msgid "Empty Cart to Group"
msgstr ""
@@ -802,6 +1066,17 @@ msgid "Empty Cart to Family"
msgstr ""
#: CartView.php:121 Include/Header.php:141
+=======
+#: CartView.php:114 Include/Header.php:131
+msgid "Empty Cart to Group"
+msgstr ""
+
+#: CartView.php:120 Include/Header.php:136
+msgid "Empty Cart to Family"
+msgstr ""
+
+#: CartView.php:124 Include/Header.php:141
+>>>>>>> master
msgid "Empty Cart to Event"
msgstr ""
@@ -813,7 +1088,11 @@ msgstr ""
msgid "Map Cart"
msgstr ""
+<<<<<<< HEAD
#: CartView.php:129
+=======
+#: CartView.php:135
+>>>>>>> master
msgid "Name Tags"
msgstr ""
@@ -821,11 +1100,16 @@ msgstr ""
msgid "Email Cart"
msgstr ""
+<<<<<<< HEAD
#: CartView.php:164 GroupView.php:205
+=======
+#: CartView.php:170 GroupView.php:205
+>>>>>>> master
#: sundayschool/SundaySchoolClassView.php:100
msgid "Email (BCC)"
msgstr ""
+<<<<<<< HEAD
#: CartView.php:193
msgid "Create Directory From Cart"
msgstr ""
@@ -856,28 +1140,80 @@ msgstr ""
#: CartView.php:289 CartView.php:347 EditEventTypes.php:171 FamilyView.php:540
#: FamilyView.php:582 GroupView.php:360 GroupView.php:401 PersonView.php:657
+=======
+#: CartView.php:195
+msgid "Text Cart"
+msgstr ""
+
+#: CartView.php:200
+msgid "Create Directory From Cart"
+msgstr ""
+
+#: CartView.php:224 CartView.php:266
+msgid "Generate Labels"
+msgstr ""
+
+#: CartView.php:232
+msgid "Bulk Mail Presort"
+msgstr ""
+
+#: CartView.php:241
+msgid "Quiet Presort"
+msgstr ""
+
+#: CartView.php:287
+msgid "Your cart contains"
+msgstr ""
+
+#: CartView.php:287
+msgid "persons from"
+msgstr ""
+
+#: CartView.php:287 Include/Functions.php:121
+msgid "families"
+msgstr ""
+
+#: CartView.php:297 CartView.php:356 EditEventTypes.php:171 FamilyView.php:553
+#: FamilyView.php:595 GroupView.php:360 GroupView.php:401 PersonView.php:657
+>>>>>>> master
#: PersonView.php:675 PersonView.php:759 PersonView.php:777
msgid "Remove"
msgstr ""
+<<<<<<< HEAD
#: CartView.php:290 CSVExport.php:276 CSVImport.php:285 FamilyEditor.php:954
+=======
+#: CartView.php:298 CSVExport.php:276 CSVImport.php:285 FamilyEditor.php:954
+>>>>>>> master
#: FinancialReports.php:120 MembersDashboard.php:302 OptionManager.php:73
#: PersonEditor.php:1043 PrintView.php:294 queryparameters_qrp.php:19
msgid "Classification"
msgstr ""
+<<<<<<< HEAD
#: CartView.php:291 CSVExport.php:180 CSVExport.php:301 OptionManager.php:66
+=======
+#: CartView.php:299 CSVExport.php:180 CSVExport.php:301 OptionManager.php:66
+>>>>>>> master
#: PersonEditor.php:742 PrintView.php:254 queryparameters_qrp.php:5
msgid "Family Role"
msgstr ""
+<<<<<<< HEAD
#: CartView.php:310 CartView.php:330 DonationFundEditor.php:180
+=======
+#: CartView.php:318 CartView.php:338 DonationFundEditor.php:180
+>>>>>>> master
#: FinancialReports.php:298 Include/Functions.php:905
#: Include/Functions.php:989 Reports/ConfirmReport.php:232
msgid "Yes"
msgstr ""
+<<<<<<< HEAD
#: CartView.php:323 CartView.php:332 DonationFundEditor.php:183
+=======
+#: CartView.php:331 CartView.php:340 DonationFundEditor.php:183
+>>>>>>> master
#: FinancialReports.php:299 Include/Functions.php:907
#: Include/Functions.php:990 Reports/ConfirmReport.php:234
msgid "No"
@@ -964,11 +1300,16 @@ msgstr ""
msgid "Action"
msgstr ""
+<<<<<<< HEAD
#: Checkin.php:480 Include/Functions.php:1658 Reports/CanvassReports.php:245
+=======
+#: Checkin.php:472 Include/Functions.php:1663 Reports/CanvassReports.php:245
+>>>>>>> master
#: Reports/VotingMembers.php:88 queryparameteroptions_qpo.php:15
msgid "Member"
msgstr ""
+<<<<<<< HEAD
#: Checkin.php:482 ChurchCRM/Service/PersonService.php:38
msgid " of the"
msgstr ""
@@ -978,18 +1319,29 @@ msgid "family"
msgstr ""
#: Checkin.php:484 ChurchCRM/Service/PersonService.php:40 PersonView.php:267
+=======
+#: Checkin.php:474 ChurchCRM/Service/PersonService.php:38
+msgid " of the"
+msgstr ""
+
+#: Checkin.php:474 ChurchCRM/Service/PersonService.php:38
+msgid "family"
+msgstr ""
+
+#: Checkin.php:476 ChurchCRM/Service/PersonService.php:40 PersonView.php:267
+>>>>>>> master
msgid "(No assigned family)"
msgstr ""
-#: CheckVersion.php:51
+#: CheckVersion.php:52
msgid "Software Version Check"
msgstr ""
-#: CheckVersion.php:61
+#: CheckVersion.php:62
msgid "Oops! Something went wrong"
msgstr ""
-#: CheckVersion.php:64
+#: CheckVersion.php:65
msgid ""
"There is an incompatibility between database schema and installed software. "
"You are seeing this message because there is a software bug or an incomplete "
@@ -1626,6 +1978,7 @@ msgstr ""
msgid "Show/Hide Lost Password Link on the login screen"
msgstr ""
+<<<<<<< HEAD
#: ChurchCRM/dto/SystemConfig.php:214
msgid "Church Information"
msgstr ""
@@ -1655,10 +2008,46 @@ msgid "Financial Settings"
msgstr ""
#: ChurchCRM/dto/SystemConfig.php:221 Include/Footer.php:144
+=======
+#: ChurchCRM/dto/SystemConfig.php:208
+msgid "Your Church's Website"
+msgstr ""
+
+#: ChurchCRM/dto/SystemConfig.php:215
+msgid "Church Information"
+msgstr ""
+
+#: ChurchCRM/dto/SystemConfig.php:216
+msgid "User setup"
+msgstr ""
+
+#: ChurchCRM/dto/SystemConfig.php:217
+msgid "Email Setup"
+msgstr ""
+
+#: ChurchCRM/dto/SystemConfig.php:218
+msgid "Member Setup"
+msgstr ""
+
+#: ChurchCRM/dto/SystemConfig.php:219
+msgid "Map Settings"
+msgstr ""
+
+#: ChurchCRM/dto/SystemConfig.php:220
+msgid "Report Settings"
+msgstr ""
+
+#: ChurchCRM/dto/SystemConfig.php:221
+msgid "Financial Settings"
+msgstr ""
+
+#: ChurchCRM/dto/SystemConfig.php:222 Include/Footer.php:144
+>>>>>>> master
#: SystemSettings.php:43
msgid "System Settings"
msgstr ""
+<<<<<<< HEAD
#: ChurchCRM/dto/SystemConfig.php:222
msgid "Backup"
msgstr ""
@@ -1677,6 +2066,26 @@ msgid "An invalid configuration name has been requested"
msgstr ""
#: ChurchCRM/dto/SystemConfig.php:317
+=======
+#: ChurchCRM/dto/SystemConfig.php:223
+msgid "Backup"
+msgstr ""
+
+#: ChurchCRM/dto/SystemConfig.php:224
+msgid "Localization"
+msgstr ""
+
+#: ChurchCRM/dto/SystemConfig.php:225
+msgid "Integration"
+msgstr ""
+
+#: ChurchCRM/dto/SystemConfig.php:275 ChurchCRM/dto/SystemConfig.php:287
+#: ChurchCRM/dto/SystemConfig.php:300
+msgid "An invalid configuration name has been requested"
+msgstr ""
+
+#: ChurchCRM/dto/SystemConfig.php:318
+>>>>>>> master
msgid "An invalid configuration id has been requested"
msgstr ""
@@ -1686,6 +2095,7 @@ msgstr ""
#: ChurchCRM/Emails/notifications/NotificationEmail.php:28
msgid "Guardian(s) of"
+<<<<<<< HEAD
msgstr ""
#: ChurchCRM/Emails/notifications/NotificationEmail.php:29
@@ -1693,6 +2103,15 @@ msgid "A notification was triggered by the classroom teacher at"
msgstr ""
#: ChurchCRM/Emails/notifications/NotificationEmail.php:29
+=======
+msgstr ""
+
+#: ChurchCRM/Emails/notifications/NotificationEmail.php:29
+msgid "A notification was triggered by the classroom teacher at"
+msgstr ""
+
+#: ChurchCRM/Emails/notifications/NotificationEmail.php:29
+>>>>>>> master
msgid "Please go to this location"
msgstr ""
@@ -1704,7 +2123,11 @@ msgstr ""
msgid "Your ChurchCRM Account was Deleted."
msgstr ""
+<<<<<<< HEAD
#: ChurchCRM/Emails/users/BaseUserEmail.php:30 Login.php:182
+=======
+#: ChurchCRM/Emails/users/BaseUserEmail.php:30 Login.php:179
+>>>>>>> master
msgid "Email/Username"
msgstr ""
@@ -1785,11 +2208,19 @@ msgid "Profile Image uploaded"
msgstr ""
#: ChurchCRM/model/ChurchCRM/Person.php:103 FamilyEditor.php:436
+<<<<<<< HEAD
#: FamilyList.php:48 Menu.php:205 PersonEditor.php:380
msgid "Created"
msgstr ""
#: ChurchCRM/model/ChurchCRM/Person.php:108 FamilyEditor.php:471 Menu.php:240
+=======
+#: FamilyList.php:48 Menu.php:211 PersonEditor.php:380
+msgid "Created"
+msgstr ""
+
+#: ChurchCRM/model/ChurchCRM/Person.php:108 FamilyEditor.php:471 Menu.php:252
+>>>>>>> master
#: PersonEditor.php:384
msgid "Updated"
msgstr ""
@@ -1889,7 +2320,11 @@ msgid "Event"
msgstr ""
#: ChurchCRM/Service/CalendarService.php:16 DirectoryReports.php:178
+<<<<<<< HEAD
#: FamilyView.php:359 PersonView.php:462 Reports/ConfirmReportEmail.php:191
+=======
+#: FamilyView.php:366 PersonView.php:462 Reports/ConfirmReportEmail.php:191
+>>>>>>> master
#: Reports/ConfirmReportEmail.php:209 Reports/ConfirmReport.php:189
#: Reports/ConfirmReport.php:208
msgid "Birthday"
@@ -1972,7 +2407,11 @@ msgstr ""
msgid "Self Registration"
msgstr ""
-#: ChurchCRM/Service/TimelineService.php:124 PrintView.php:484
+#: ChurchCRM/Service/TimelineService.php:118
+msgid "Self Verification"
+msgstr ""
+
+#: ChurchCRM/Service/TimelineService.php:126 PrintView.php:484
msgid "by"
msgstr ""
@@ -2010,6 +2449,7 @@ msgstr ""
msgid "SMTP Server info are blank"
msgstr ""
+<<<<<<< HEAD
#: ChurchCRM/tasks/FamilyWorkPhoneTask.php:30 DirectoryReports.php:181
msgid "Family Work Phone"
msgstr ""
@@ -2019,10 +2459,13 @@ msgid "In Church CRM 2.6.0 we will no longer support a work phone for a family"
msgstr ""
#: ChurchCRM/tasks/HttpsTask.php:18
+=======
+#: ChurchCRM/tasks/HttpsTask.php:19
+>>>>>>> master
msgid "Configure HTTPS"
msgstr ""
-#: ChurchCRM/tasks/HttpsTask.php:21
+#: ChurchCRM/tasks/HttpsTask.php:22
msgid "Your system could be more secure by installing an TLS/SSL Cert."
msgstr ""
@@ -2258,7 +2701,11 @@ msgstr ""
#: CSVImport.php:232 PersonView.php:278 PrintView.php:238
#: sundayschool/SundaySchoolClassView.php:200
+<<<<<<< HEAD
#: sundayschool/SundaySchoolDashboard.php:183
+=======
+#: sundayschool/SundaySchoolDashboard.php:195
+>>>>>>> master
msgid "Birth Date"
msgstr ""
@@ -2396,7 +2843,11 @@ msgstr ""
msgid "Run Transactions"
msgstr ""
+<<<<<<< HEAD
#: DepositSlipEditor.php:223 FamilyView.php:880 FindDepositSlip.php:98
+=======
+#: DepositSlipEditor.php:223 FamilyView.php:897 FindDepositSlip.php:98
+>>>>>>> master
#: PersonView.php:897 PledgeDelete.php:23
msgid "Confirm Delete"
msgstr ""
@@ -2454,12 +2905,23 @@ msgstr ""
msgid "Family Home Phone"
msgstr ""
+<<<<<<< HEAD
+=======
+#: DirectoryReports.php:181
+msgid "Family Work Phone"
+msgstr ""
+
+>>>>>>> master
#: DirectoryReports.php:182
msgid "Family Cell Phone"
msgstr ""
#: DirectoryReports.php:183
+<<<<<<< HEAD
#: external/templates/verify/verify-family-info.php:27
+=======
+#: external/templates/verify/verify-family-info.php:30
+>>>>>>> master
#: Reports/ConfirmReportEmail.php:160 Reports/ConfirmReport.php:161
msgid "Family Email"
msgstr ""
@@ -2568,8 +3030,13 @@ msgstr ""
#: DonatedItemEditor.php:277 DonationFundEditor.php:154
#: DonationFundEditor.php:224 EditEventAttendees.php:34
+<<<<<<< HEAD
#: FundRaiserEditor.php:178 GroupEditor.php:83 GroupPropsFormEditor.php:285
#: GroupPropsFormEditor.php:409 GroupView.php:322 ListEvents.php:215
+=======
+#: FundRaiserEditor.php:178 GroupEditor.php:83 GroupPropsFormEditor.php:286
+#: GroupPropsFormEditor.php:410 GroupView.php:322 ListEvents.php:215
+>>>>>>> master
#: PersonView.php:757 PropertyTypeEditor.php:108
#: VolunteerOpportunityEditor.php:90 VolunteerOpportunityEditor.php:369
#: VolunteerOpportunityEditor.php:443
@@ -2599,9 +3066,15 @@ msgid ""
"using a delete or 'add new' button!"
msgstr ""
+<<<<<<< HEAD
#: DonationFundEditor.php:135 FamilyCustomFieldsEditor.php:325
#: GroupPropsFormEditor.php:276 OptionManager.php:314
#: PersonCustomFieldsEditor.php:307 PersonEditor.php:571
+=======
+#: DonationFundEditor.php:135 FamilyCustomFieldsEditor.php:326
+#: GroupPropsFormEditor.php:277 OptionManager.php:314
+#: PersonCustomFieldsEditor.php:308 PersonEditor.php:571
+>>>>>>> master
#: VolunteerOpportunityEditor.php:354
msgid ""
"Invalid fields or selections. Changes not saved! Please correct and try "
@@ -2618,18 +3091,30 @@ msgid "Active"
msgstr ""
#: DonationFundEditor.php:170 DonationFundEditor.php:219
+<<<<<<< HEAD
#: FamilyCustomFieldsEditor.php:348 FamilyCustomFieldsEditor.php:448
#: FamilyEditor.php:221 GroupPropsFormEditor.php:314
#: GroupPropsFormEditor.php:400 OptionManager.php:355
#: PersonCustomFieldsEditor.php:335 PersonCustomFieldsEditor.php:449
+=======
+#: FamilyCustomFieldsEditor.php:349 FamilyCustomFieldsEditor.php:449
+#: FamilyEditor.php:221 GroupPropsFormEditor.php:315
+#: GroupPropsFormEditor.php:401 OptionManager.php:355
+#: PersonCustomFieldsEditor.php:336 PersonCustomFieldsEditor.php:450
+>>>>>>> master
#: PropertyEditor.php:75 PropertyTypeEditor.php:49
#: VolunteerOpportunityEditor.php:397 VolunteerOpportunityEditor.php:438
msgid "You must enter a name"
msgstr ""
#: DonationFundEditor.php:199 EventEditor.php:560 EventNames.php:237
+<<<<<<< HEAD
#: FamilyCustomFieldsEditor.php:414 GroupPropsFormEditor.php:367
#: OptionManager.php:371 PersonCustomFieldsEditor.php:410
+=======
+#: FamilyCustomFieldsEditor.php:415 GroupPropsFormEditor.php:368
+#: OptionManager.php:371 PersonCustomFieldsEditor.php:411
+>>>>>>> master
#: VolunteerOpportunityEditor.php:417
msgid "Save Changes"
msgstr ""
@@ -2760,11 +3245,19 @@ msgstr ""
msgid "Add a New Electronic Payment Method"
msgstr ""
+<<<<<<< HEAD
#: ElectronicPaymentList.php:199 FamilyCustomFieldsEditor.php:329
#: FamilyCustomFieldsEditor.php:431 FamilyView.php:534 FamilyView.php:639
#: GroupPropsFormEditor.php:283 GroupPropsFormEditor.php:384 GroupView.php:320
#: GroupView.php:354 OptionManager.php:81 PersonCustomFieldsEditor.php:313
#: PersonCustomFieldsEditor.php:432 PersonView.php:653 PropertyEditor.php:133
+=======
+#: ElectronicPaymentList.php:199 FamilyCustomFieldsEditor.php:330
+#: FamilyCustomFieldsEditor.php:432 FamilyView.php:547 FamilyView.php:655
+#: GroupPropsFormEditor.php:284 GroupPropsFormEditor.php:385 GroupView.php:320
+#: GroupView.php:354 OptionManager.php:81 PersonCustomFieldsEditor.php:314
+#: PersonCustomFieldsEditor.php:433 PersonView.php:653 PropertyEditor.php:133
+>>>>>>> master
#: SelectDelete.php:214
msgid "Type"
msgstr ""
@@ -2773,7 +3266,11 @@ msgstr ""
msgid "Next Date"
msgstr ""
+<<<<<<< HEAD
#: ElectronicPaymentList.php:202 FamilyView.php:641 FamilyView.php:749
+=======
+#: ElectronicPaymentList.php:202 FamilyView.php:657 FamilyView.php:766
+>>>>>>> master
#: PledgeEditor.php:717 SelectDelete.php:218
msgid "Amount"
msgstr ""
@@ -2813,91 +3310,100 @@ msgid "Vanco CC"
msgstr ""
#: ElectronicPaymentList.php:221 ElectronicPaymentList.php:287
+<<<<<<< HEAD
#: EventNames.php:297 FamilyView.php:212 FamilyView.php:644 FamilyView.php:693
#: FamilyView.php:754 FindFundRaiser.php:239 FindFundRaiser.php:247
+=======
+#: EventNames.php:297 FamilyView.php:216 FamilyView.php:660 FamilyView.php:709
+#: FamilyView.php:771 FindFundRaiser.php:239 FindFundRaiser.php:247
+>>>>>>> master
#: ListEvents.php:233 PersonView.php:238 PropertyList.php:68
#: PropertyList.php:109 PropertyTypeList.php:43 PropertyTypeList.php:63
#: SelectList.php:1073
msgid "Edit"
msgstr ""
-#: email/Dashboard.php:23
+#: email/Dashboard.php:25
msgid "eMail Dashboard"
msgstr ""
-#: email/Dashboard.php:31
+#: email/Dashboard.php:33
msgid "Email Export"
msgstr ""
-#: email/Dashboard.php:34
+#: email/Dashboard.php:36
msgid "You can import the generated CSV file to external email system."
msgstr ""
-#: email/Dashboard.php:36
+#: email/Dashboard.php:38
msgid "import subscribers to a list."
msgstr ""
-#: email/Dashboard.php:41
+#: email/Dashboard.php:43
msgid "Generate"
msgstr ""
-#: email/Dashboard.php:57
+#: email/Dashboard.php:59
msgid "List"
msgstr ""
-#: email/Dashboard.php:62
+#: email/Dashboard.php:64
msgid "Members:"
msgstr ""
-#: email/Dashboard.php:63
+#: email/Dashboard.php:65
msgid "Campaigns:"
msgstr ""
-#: email/Dashboard.php:64
+#: email/Dashboard.php:66
msgid "Unsubscribed count:"
msgstr ""
-#: email/Dashboard.php:65
+#: email/Dashboard.php:67
msgid "Unsubscribed count since last send:"
msgstr ""
-#: email/Dashboard.php:66
+#: email/Dashboard.php:68
msgid "Cleaned count:"
msgstr ""
-#: email/Dashboard.php:67
+#: email/Dashboard.php:69
msgid "Cleaned count since last send:"
msgstr ""
-#: email/Dashboard.php:83
+#: email/Dashboard.php:85
msgid "Missing emails report"
msgstr ""
-#: email/Dashboard.php:96
+#: email/Dashboard.php:98
msgid "is not configured"
msgstr ""
-#: email/Dashboard.php:97
+#: email/Dashboard.php:99
msgid "Please update the"
msgstr ""
-#: email/Dashboard.php:97
+#: email/Dashboard.php:99
msgid "API key in Setting->"
msgstr ""
+<<<<<<< HEAD
#: email/Dashboard.php:97 Include/Footer.php:152
+=======
+#: email/Dashboard.php:99 Include/Footer.php:152
+>>>>>>> master
msgid "Edit General Settings"
msgstr ""
-#: email/Dashboard.php:98
+#: email/Dashboard.php:100
msgid "then update"
msgstr ""
-#: email/Dashboard.php:98
+#: email/Dashboard.php:100
msgid "For more info see our "
msgstr ""
-#: email/Dashboard.php:98
+#: email/Dashboard.php:100
msgid "support docs."
msgstr ""
@@ -3228,7 +3734,11 @@ msgid "Register"
msgstr ""
#: external/templates/registration/family-register-members.php:20
+<<<<<<< HEAD
#: FamilyEditor.php:926 FamilyView.php:357 PersonView.php:460
+=======
+#: FamilyEditor.php:926 FamilyView.php:364 PersonView.php:460
+>>>>>>> master
#: PrintView.php:319
msgid "Family Members"
msgstr ""
@@ -3280,16 +3790,22 @@ msgstr ""
msgid "email"
msgstr ""
-#: external/templates/verify/verify-family-info.php:7
+#: external/templates/verify/verify-family-info.php:8
msgid "Family Verification"
msgstr ""
+<<<<<<< HEAD
#: external/templates/verify/verify-family-info.php:13
#: external/templates/verify/verify-family-info.php:122
+=======
+#: external/templates/verify/verify-family-info.php:14
+#: external/templates/verify/verify-family-info.php:132
+>>>>>>> master
#: ManageEnvelopes.php:138
msgid "Confirm"
msgstr ""
+<<<<<<< HEAD
#: external/templates/verify/verify-family-info.php:25
#: sundayschool/SundaySchoolClassView.php:205
#: sundayschool/SundaySchoolDashboard.php:185
@@ -3298,22 +3814,33 @@ msgstr ""
#: external/templates/verify/verify-family-info.php:36 FamilyEditor.php:787
#: FamilyView.php:237 Reports/ConfirmReportEmail.php:144
+=======
+#: external/templates/verify/verify-family-info.php:26
+#: sundayschool/SundaySchoolClassView.php:205
+#: sundayschool/SundaySchoolDashboard.php:197
+msgid "Home Address"
+msgstr ""
+
+#: external/templates/verify/verify-family-info.php:40 FamilyEditor.php:787
+#: FamilyView.php:241 Reports/ConfirmReportEmail.php:144
+>>>>>>> master
#: Reports/ConfirmReport.php:145
msgid "Send Newsletter"
msgstr ""
-#: external/templates/verify/verify-family-info.php:47
+#: external/templates/verify/verify-family-info.php:51
msgid "Family Member(s)"
msgstr ""
-#: external/templates/verify/verify-family-info.php:74
+#: external/templates/verify/verify-family-info.php:83
msgid "Work Email"
msgstr ""
-#: external/templates/verify/verify-family-info.php:77
+#: external/templates/verify/verify-family-info.php:87
msgid "Age Hidden"
msgstr ""
+<<<<<<< HEAD
#: external/templates/verify/verify-family-info.php:126
msgid "Please let us know what information to update if any"
msgstr ""
@@ -3343,18 +3870,54 @@ msgid "Default Option"
msgstr ""
#: FamilyCustomFieldsEditor.php:296
+=======
+#: external/templates/verify/verify-family-info.php:136
+msgid "Please let us know what information to update if any"
+msgstr ""
+
+#: external/templates/verify/verify-family-info.php:141
+msgid "Your verification request is complete"
+msgstr ""
+
+#: external/templates/verify/verify-family-info.php:145
+msgid "We encountered an error submitting with your verification data"
+msgstr ""
+
+#: external/templates/verify/verify-family-info.php:150
+msgid "Verify"
+msgstr ""
+
+#: external/templates/verify/verify-family-info.php:151
+msgid "Visit our Site"
+msgstr ""
+
+#: FamilyCustomFieldsEditor.php:41
+msgid "Custom Family Fields Editor"
+msgstr ""
+
+#: FamilyCustomFieldsEditor.php:178 PersonCustomFieldsEditor.php:160
+msgid "Default Option"
+msgstr ""
+
+#: FamilyCustomFieldsEditor.php:297
+>>>>>>> master
msgid ""
"Warning: By deleting this field, you will irrevokably lose all family data "
"assigned for this field!"
msgstr ""
+<<<<<<< HEAD
#: FamilyCustomFieldsEditor.php:308 PersonCustomFieldsEditor.php:290
+=======
+#: FamilyCustomFieldsEditor.php:309 PersonCustomFieldsEditor.php:291
+>>>>>>> master
msgid ""
"Warning: Arrow and delete buttons take effect immediately. Field name "
"changes will be lost if you do not 'Save Changes' before using an up, down, "
"delete or 'add new' button!"
msgstr ""
+<<<<<<< HEAD
#: FamilyCustomFieldsEditor.php:317
msgid "No custom Family fields have been added yet"
msgstr ""
@@ -3408,6 +3971,61 @@ msgstr ""
#: FamilyCustomFieldsEditor.php:467 GroupPropsFormEditor.php:414
#: PersonCustomFieldsEditor.php:468
+=======
+#: FamilyCustomFieldsEditor.php:318
+msgid "No custom Family fields have been added yet"
+msgstr ""
+
+#: FamilyCustomFieldsEditor.php:332 GroupPropsFormEditor.php:287
+#: PersonCustomFieldsEditor.php:316
+msgid "Special option"
+msgstr ""
+
+#: FamilyCustomFieldsEditor.php:333 FamilyCustomFieldsEditor.php:458
+#: PersonCustomFieldsEditor.php:317 PersonCustomFieldsEditor.php:465
+msgid "Security Option"
+msgstr ""
+
+#: FamilyCustomFieldsEditor.php:334
+msgid "Family-View Side"
+msgstr ""
+
+#: FamilyCustomFieldsEditor.php:374 GroupPropsFormEditor.php:345
+#: PersonCustomFieldsEditor.php:360
+msgid "You must select a group."
+msgstr ""
+
+#: FamilyCustomFieldsEditor.php:379 PersonCustomFieldsEditor.php:363
+msgid "Edit List Options"
+msgstr ""
+
+#: FamilyCustomFieldsEditor.php:389 FamilyCustomFieldsEditor.php:463
+#: PersonCustomFieldsEditor.php:381 PersonCustomFieldsEditor.php:460
+msgid "Left"
+msgstr ""
+
+#: FamilyCustomFieldsEditor.php:390 FamilyCustomFieldsEditor.php:464
+#: PersonCustomFieldsEditor.php:385 PersonCustomFieldsEditor.php:461
+msgid "Right"
+msgstr ""
+
+#: FamilyCustomFieldsEditor.php:442 GroupPropsFormEditor.php:394
+#: PersonCustomFieldsEditor.php:443
+msgid "Help on types.."
+msgstr ""
+
+#: FamilyCustomFieldsEditor.php:452 GroupPropsFormEditor.php:404
+#: PersonCustomFieldsEditor.php:453
+msgid "That field name already exists."
+msgstr ""
+
+#: FamilyCustomFieldsEditor.php:462 PersonCustomFieldsEditor.php:459
+msgid "Side"
+msgstr ""
+
+#: FamilyCustomFieldsEditor.php:468 GroupPropsFormEditor.php:415
+#: PersonCustomFieldsEditor.php:469
+>>>>>>> master
msgid "Add New Field"
msgstr ""
@@ -3483,7 +4101,11 @@ msgstr ""
msgid "Envelope Info"
msgstr ""
+<<<<<<< HEAD
#: FamilyEditor.php:881 FamilyView.php:249 ManageEnvelopes.php:170
+=======
+#: FamilyEditor.php:881 FamilyView.php:254 ManageEnvelopes.php:170
+>>>>>>> master
#: PledgeEditor.php:528
msgid "Envelope Number"
msgstr ""
@@ -3510,7 +4132,11 @@ msgstr ""
msgid "Last"
msgstr ""
+<<<<<<< HEAD
#: FamilyEditor.php:950 FamilyView.php:358 OptionManager.php:64
+=======
+#: FamilyEditor.php:950 FamilyView.php:365 OptionManager.php:64
+>>>>>>> master
#: OptionManager.php:97 PersonView.php:461 PrintView.php:324 PrintView.php:379
#: Reports/CanvassReports.php:243 Reports/GroupReport.php:107
msgid "Role"
@@ -3576,7 +4202,11 @@ msgstr ""
msgid "Unk"
msgstr ""
+<<<<<<< HEAD
#: FamilyList.php:29 FamilyView.php:312
+=======
+#: FamilyList.php:29 FamilyView.php:319
+>>>>>>> master
msgid "Family List"
msgstr ""
@@ -3601,83 +4231,168 @@ msgstr ""
msgid " This Family is Deactivated"
msgstr ""
-#: FamilyView.php:193 PersonView.php:194
+<<<<<<< HEAD
+#: FamilyView.php:193 PersonView.php:194
+msgid "View Photo"
+msgstr ""
+
+#: FamilyView.php:196 PersonView.php:197
+msgid "Upload Photo"
+msgstr ""
+
+#: FamilyView.php:200 PersonView.php:201
+msgid "Delete Photo"
+msgstr ""
+
+#: FamilyView.php:226
+msgid " of church "
+msgstr ""
+
+#: FamilyView.php:232
+msgid "Latitude/Longitude"
+msgstr ""
+
+#: FamilyView.php:302
+msgid "Verify Info"
+msgstr ""
+
+#: FamilyView.php:304
+msgid "Add New Member"
+msgstr ""
+
+#: FamilyView.php:308
+msgid "Previous Family"
+msgstr ""
+
+#: FamilyView.php:316
+msgid "Next Family"
+msgstr ""
+
+#: FamilyView.php:322
+msgid "Delete this Family"
+msgstr ""
+
+#: FamilyView.php:331 PersonView.php:353
+msgid "Add a Note"
+msgstr ""
+
+#: FamilyView.php:336
+msgid "Add All Family Members to Cart"
+msgstr ""
+
+#: FamilyView.php:343
+msgid " this Family"
+msgstr ""
+
+#: FamilyView.php:436 PersonView.php:379
+msgid "Timeline"
+msgstr ""
+
+#: FamilyView.php:438 GroupView.php:342 PersonView.php:382 PrintView.php:435
+msgid "Assigned Properties"
+msgstr ""
+
+#: FamilyView.php:442
+msgid "Automatic Payments"
+msgstr ""
+
+#: FamilyView.php:444
+msgid "Pledges and Payments"
+msgstr ""
+
+#: FamilyView.php:527 PersonView.php:647 PrintView.php:446
+msgid "No property assignments."
+msgstr ""
+
+#: FamilyView.php:536 GroupView.php:356 PersonView.php:655 PrintView.php:451
+=======
+#: FamilyView.php:195 PersonView.php:194
msgid "View Photo"
msgstr ""
-#: FamilyView.php:196 PersonView.php:197
+#: FamilyView.php:199 PersonView.php:197
msgid "Upload Photo"
msgstr ""
-#: FamilyView.php:200 PersonView.php:201
+#: FamilyView.php:204 PersonView.php:201
msgid "Delete Photo"
msgstr ""
-#: FamilyView.php:226
+#: FamilyView.php:230
msgid " of church "
msgstr ""
-#: FamilyView.php:232
+#: FamilyView.php:236
msgid "Latitude/Longitude"
msgstr ""
-#: FamilyView.php:302
+#: FamilyView.php:309
msgid "Verify Info"
msgstr ""
-#: FamilyView.php:304
+#: FamilyView.php:311
msgid "Add New Member"
msgstr ""
-#: FamilyView.php:308
+#: FamilyView.php:315
msgid "Previous Family"
msgstr ""
-#: FamilyView.php:316
+#: FamilyView.php:323
msgid "Next Family"
msgstr ""
-#: FamilyView.php:322
+#: FamilyView.php:329
msgid "Delete this Family"
msgstr ""
-#: FamilyView.php:331 PersonView.php:353
+#: FamilyView.php:338 PersonView.php:353
msgid "Add a Note"
msgstr ""
-#: FamilyView.php:336
+#: FamilyView.php:343
msgid "Add All Family Members to Cart"
msgstr ""
-#: FamilyView.php:343
+#: FamilyView.php:349
+msgid "Deactivate"
+msgstr ""
+
+#: FamilyView.php:349
+msgid "Activate"
+msgstr ""
+
+#: FamilyView.php:349
msgid " this Family"
msgstr ""
-#: FamilyView.php:436 PersonView.php:379
+#: FamilyView.php:447 PersonView.php:379
msgid "Timeline"
msgstr ""
-#: FamilyView.php:438 GroupView.php:342 PersonView.php:382 PrintView.php:435
+#: FamilyView.php:449 GroupView.php:342 PersonView.php:382 PrintView.php:435
msgid "Assigned Properties"
msgstr ""
-#: FamilyView.php:442
+#: FamilyView.php:453
msgid "Automatic Payments"
msgstr ""
-#: FamilyView.php:444
+#: FamilyView.php:455
msgid "Pledges and Payments"
msgstr ""
-#: FamilyView.php:527 PersonView.php:647 PrintView.php:446
+#: FamilyView.php:540 PersonView.php:647 PrintView.php:446
msgid "No property assignments."
msgstr ""
-#: FamilyView.php:536 GroupView.php:356 PersonView.php:655 PrintView.php:451
+#: FamilyView.php:549 GroupView.php:356 PersonView.php:655 PrintView.php:451
+>>>>>>> master
#: PropertyAssign.php:180 SystemSettings.php:152
msgid "Value"
msgstr ""
+<<<<<<< HEAD
#: FamilyView.php:539 FamilyView.php:577 GroupView.php:359 GroupView.php:395
msgid "Edit Value"
msgstr ""
@@ -3691,10 +4406,26 @@ msgid "select an option"
msgstr ""
#: FamilyView.php:618 GroupView.php:433 PersonView.php:724 PersonView.php:810
+=======
+#: FamilyView.php:552 FamilyView.php:590 GroupView.php:359 GroupView.php:395
+msgid "Edit Value"
+msgstr ""
+
+#: FamilyView.php:613 PersonView.php:688
+msgid "Assign a New Property"
+msgstr ""
+
+#: FamilyView.php:619 PersonView.php:696 QueryView.php:322
+msgid "select an option"
+msgstr ""
+
+#: FamilyView.php:634 GroupView.php:433 PersonView.php:724 PersonView.php:810
+>>>>>>> master
#: PropertyAssign.php:189 SelectList.php:1081
msgid "Assign"
msgstr ""
+<<<<<<< HEAD
#: FamilyView.php:640
msgid "Next payment date"
msgstr ""
@@ -3764,10 +4495,82 @@ msgid " Canvass Entry"
msgstr ""
#: FamilyView.php:884 PersonView.php:901
+=======
+#: FamilyView.php:656
+msgid "Next payment date"
+msgstr ""
+
+#: FamilyView.php:658
+msgid "Interval (months)"
+msgstr ""
+
+#: FamilyView.php:662 FamilyView.php:773 SelectDelete.php:222
+msgid "Date Updated"
+msgstr ""
+
+#: FamilyView.php:663 FamilyView.php:774 SelectDelete.php:223
+msgid "Updated By"
+msgstr ""
+
+#: FamilyView.php:729
+msgid "Add a new automatic payment"
+msgstr ""
+
+#: FamilyView.php:741
+msgid "Show Pledges"
+msgstr ""
+
+#: FamilyView.php:745
+msgid "Show Payments"
+msgstr ""
+
+#: FamilyView.php:746
+msgid "Since"
+msgstr ""
+
+#: FamilyView.php:754 MemberRoleChange.php:120 PropertyAssign.php:191
+msgid "Update"
+msgstr ""
+
+#: FamilyView.php:762
+msgid "Pledge or Payment"
+msgstr ""
+
+#: FamilyView.php:767
+msgid "NonDeductible"
+msgstr ""
+
+#: FamilyView.php:768 SelectDelete.php:219
+msgid "Schedule"
+msgstr ""
+
+#: FamilyView.php:769 SelectDelete.php:220
+msgid "Method"
+msgstr ""
+
+#: FamilyView.php:770 PledgeEditor.php:725 SelectDelete.php:221
+msgid "Comment"
+msgstr ""
+
+#: FamilyView.php:862
+msgid "Add a new pledge"
+msgstr ""
+
+#: FamilyView.php:864
+msgid "Add a new payment"
+msgstr ""
+
+#: FamilyView.php:875
+msgid " Canvass Entry"
+msgstr ""
+
+#: FamilyView.php:901 PersonView.php:901
+>>>>>>> master
msgid ""
"You are about to delete the profile photo, this procedure is irreversible."
msgstr ""
+<<<<<<< HEAD
#: FamilyView.php:886 PersonView.php:903
msgid "Do you want to proceed?"
msgstr ""
@@ -3781,11 +4584,27 @@ msgid "Select how do you want to request the family information to be verified"
msgstr ""
#: FamilyView.php:912
+=======
+#: FamilyView.php:903 PersonView.php:903
+msgid "Do you want to proceed?"
+msgstr ""
+
+#: FamilyView.php:923
+msgid "Request Family Info Verification"
+msgstr ""
+
+#: FamilyView.php:926
+msgid "Select how do you want to request the family information to be verified"
+msgstr ""
+
+#: FamilyView.php:930
+>>>>>>> master
msgid ""
"You are about to email copy of the family information in pdf to the "
"following emails"
msgstr ""
+<<<<<<< HEAD
#: FamilyView.php:928
msgid "Online Verification"
msgstr ""
@@ -3803,10 +4622,30 @@ msgid "Oops! Family not found."
msgstr ""
#: FamilyView.php:950
+=======
+#: FamilyView.php:947
+msgid "Online Verification"
+msgstr ""
+
+#: FamilyView.php:952
+msgid "PDF Report"
+msgstr ""
+
+#: FamilyView.php:954
+msgid "Verified In Person"
+msgstr ""
+
+#: FamilyView.php:967
+msgid "Oops! Family not found."
+msgstr ""
+
+#: FamilyView.php:970
+>>>>>>> master
msgid ""
"We could not find the family you were looking for. Meanwhile, you may"
msgstr ""
+<<<<<<< HEAD
#: FamilyView.php:951 PersonView.php:1013
msgid "return to member dashboard"
msgstr ""
@@ -3828,6 +4667,29 @@ msgid "Please confirm activation of family"
msgstr ""
#: FamilyView.php:1026
+=======
+#: FamilyView.php:971 PersonView.php:1007
+msgid "return to member dashboard"
+msgstr ""
+
+#: FamilyView.php:988
+msgid "Confirm Deactivation"
+msgstr ""
+
+#: FamilyView.php:988
+msgid "Confirm Activation"
+msgstr ""
+
+#: FamilyView.php:990
+msgid "Please confirm deactivation of family"
+msgstr ""
+
+#: FamilyView.php:993
+msgid "Please confirm activation of family"
+msgstr ""
+
+#: FamilyView.php:1046
+>>>>>>> master
msgid "Family Photo"
msgstr ""
@@ -4159,7 +5021,11 @@ msgstr ""
msgid "Display:"
msgstr ""
+<<<<<<< HEAD
#: FundRaiserEditor.php:35 menuconfig_mcf.php:25
+=======
+#: FundRaiserEditor.php:35 menuconfig_mcf.php:26
+>>>>>>> master
msgid "Fundraiser"
msgstr ""
@@ -4167,7 +5033,11 @@ msgstr ""
msgid "Create New Fund Raiser"
msgstr ""
+<<<<<<< HEAD
#: FundRaiserEditor.php:56 Include/Functions.php:1332 PledgeEditor.php:321
+=======
+#: FundRaiserEditor.php:56 Include/Functions.php:1337 PledgeEditor.php:321
+>>>>>>> master
msgid "Not a valid date"
msgstr ""
@@ -4307,7 +5177,11 @@ msgstr ""
msgid "from group"
msgstr ""
+<<<<<<< HEAD
#: GroupEditor.php:119 GroupPropsFormEditor.php:325
+=======
+#: GroupEditor.php:119 GroupPropsFormEditor.php:326
+>>>>>>> master
msgid "Select a group"
msgstr ""
@@ -4381,6 +5255,7 @@ msgstr ""
msgid "data for member"
msgstr ""
+<<<<<<< HEAD
#: GroupPropsFormEditor.php:42
msgid "Group-Specific Properties Form Editor:"
msgstr ""
@@ -4394,16 +5269,39 @@ msgid "No properties have been added yet"
msgstr ""
#: GroupPropsFormEditor.php:270
+=======
+#: GroupPropsFormEditor.php:43
+msgid "Group-Specific Properties Form Editor:"
+msgstr ""
+
+#: GroupPropsFormEditor.php:170
+msgid "'Default Option'"
+msgstr ""
+
+#: GroupPropsFormEditor.php:265
+msgid "No properties have been added yet"
+msgstr ""
+
+#: GroupPropsFormEditor.php:271
+>>>>>>> master
msgid ""
"Warning: Field changes will be lost if you do not 'Save Changes' before "
"using an up, down, delete, or 'add new' button!"
msgstr ""
+<<<<<<< HEAD
#: GroupPropsFormEditor.php:287
msgid "Show in"
msgstr ""
#: GroupPropsFormEditor.php:287
+=======
+#: GroupPropsFormEditor.php:288
+msgid "Show in"
+msgstr ""
+
+#: GroupPropsFormEditor.php:288
+>>>>>>> master
msgid "Person View"
msgstr ""
@@ -4889,6 +5787,7 @@ msgstr ""
msgid "Fall"
msgstr ""
+<<<<<<< HEAD
#: Include/Functions.php:1139
msgid "Error: Invalid Editor ID!"
msgstr ""
@@ -4922,6 +5821,41 @@ msgid " Italic"
msgstr ""
#: Include/Functions.php:1573
+=======
+#: Include/Functions.php:1144
+msgid "Error: Invalid Editor ID!"
+msgstr ""
+
+#: Include/Functions.php:1349
+msgid "Invalid Year"
+msgstr ""
+
+#: Include/Functions.php:1352
+msgid "Out of range: Allowable values are 1901 to 2155"
+msgstr ""
+
+#: Include/Functions.php:1365 Include/Functions.php:1381
+msgid "Invalid Number"
+msgstr ""
+
+#: Include/Functions.php:1368
+msgid "Number too large. Must be between -2147483648 and 2147483647"
+msgstr ""
+
+#: Include/Functions.php:1384
+msgid "Money amount too large. Maximum is $999999999.99"
+msgstr ""
+
+#: Include/Functions.php:1573
+msgid " Bold Italic"
+msgstr ""
+
+#: Include/Functions.php:1576
+msgid " Italic"
+msgstr ""
+
+#: Include/Functions.php:1578
+>>>>>>> master
msgid " Bold"
msgstr ""
@@ -4963,7 +5897,11 @@ msgstr ""
msgid "Submit"
msgstr ""
+<<<<<<< HEAD
#: Include/Header-function.php:260 Include/Header.php:233 menuconfig_mcf.php:5
+=======
+#: Include/Header-function.php:272 Include/Header.php:233 menuconfig_mcf.php:5
+>>>>>>> master
msgid "Dashboard"
msgstr ""
@@ -5196,6 +6134,7 @@ msgid ""
"administrator."
msgstr ""
+<<<<<<< HEAD
#: Login.php:150 Login.php:207
msgid "Login"
msgstr ""
@@ -5213,6 +6152,25 @@ msgid "I forgot my password"
msgstr ""
#: Login.php:214
+=======
+#: Login.php:147 Login.php:198
+msgid "Login"
+msgstr ""
+
+#: Login.php:159
+msgid "Please Login"
+msgstr ""
+
+#: Login.php:164
+msgid "Your previous session timed out. Please login again."
+msgstr ""
+
+#: Login.php:190
+msgid "I forgot my password"
+msgstr ""
+
+#: Login.php:206
+>>>>>>> master
msgid "Register a new Family"
msgstr ""
@@ -5352,7 +6310,11 @@ msgstr ""
msgid "More info"
msgstr ""
+<<<<<<< HEAD
#: MembersDashboard.php:198 Menu.php:130 menuconfig_mcf.php:10
+=======
+#: MembersDashboard.php:198 Menu.php:130 menuconfig_mcf.php:11
+>>>>>>> master
msgid "Groups"
msgstr ""
@@ -5446,6 +6408,7 @@ msgstr ""
msgid "Latest Families"
msgstr ""
+<<<<<<< HEAD
#: Menu.php:231
msgid "Updated Families"
msgstr ""
@@ -5455,6 +6418,17 @@ msgid "Latest Members"
msgstr ""
#: Menu.php:303
+=======
+#: Menu.php:237
+msgid "Updated Families"
+msgstr ""
+
+#: Menu.php:280
+msgid "Latest Members"
+msgstr ""
+
+#: Menu.php:315
+>>>>>>> master
msgid "Updated Members"
msgstr ""
@@ -5657,21 +6631,37 @@ msgstr ""
msgid "Select"
msgstr ""
+<<<<<<< HEAD
#: PersonCustomFieldsEditor.php:28
msgid "Custom Person Fields Editor"
msgstr ""
#: PersonCustomFieldsEditor.php:278
+=======
+#: PersonCustomFieldsEditor.php:29
+msgid "Custom Person Fields Editor"
+msgstr ""
+
+#: PersonCustomFieldsEditor.php:279
+>>>>>>> master
msgid ""
"Warning: By deleting this field, you will irrevokably lose all person data "
"assigned for this field!"
msgstr ""
+<<<<<<< HEAD
#: PersonCustomFieldsEditor.php:299
msgid "No custom person fields have been added yet"
msgstr ""
#: PersonCustomFieldsEditor.php:317
+=======
+#: PersonCustomFieldsEditor.php:300
+msgid "No custom person fields have been added yet"
+msgstr ""
+
+#: PersonCustomFieldsEditor.php:318
+>>>>>>> master
msgid "Person-View Side"
msgstr ""
@@ -5852,6 +6842,7 @@ msgstr ""
msgid "Are you sure you want to remove this person from the Group"
msgstr ""
+<<<<<<< HEAD
#: PersonView.php:990
msgid "Photo"
msgstr ""
@@ -5861,6 +6852,17 @@ msgid "Oops! Person not found."
msgstr ""
#: PersonView.php:1013
+=======
+#: PersonView.php:984
+msgid "Photo"
+msgstr ""
+
+#: PersonView.php:1004
+msgid "Oops! Person not found."
+msgstr ""
+
+#: PersonView.php:1007
+>>>>>>> master
msgid ""
"We could not find the person you were looking for. Meanwhile, you may"
msgstr ""
@@ -5975,7 +6977,11 @@ msgstr ""
#: PrintView.php:325 Reports/CanvassReports.php:244
#: sundayschool/SundaySchoolClassView.php:201
+<<<<<<< HEAD
#: sundayschool/SundaySchoolDashboard.php:184
+=======
+#: sundayschool/SundaySchoolDashboard.php:196
+>>>>>>> master
msgid "Age"
msgstr ""
@@ -6096,8 +7102,13 @@ msgid "Property Type Editor"
msgstr ""
#: PropertyTypeEditor.php:90 PropertyTypeList.php:40
+<<<<<<< HEAD
#: sundayschool/SundaySchoolDashboard.php:145
#: sundayschool/SundaySchoolDashboard.php:226 queryparameters_qrp.php:12
+=======
+#: sundayschool/SundaySchoolDashboard.php:151
+#: sundayschool/SundaySchoolDashboard.php:238 queryparameters_qrp.php:12
+>>>>>>> master
msgid "Class"
msgstr ""
@@ -6634,7 +7645,11 @@ msgstr ""
msgid "Person Listing"
msgstr ""
+<<<<<<< HEAD
#: SelectList.php:184 menuconfig_mcf.php:12
+=======
+#: SelectList.php:184 menuconfig_mcf.php:13
+>>>>>>> master
msgid "Group Assignment Helper"
msgstr ""
@@ -6766,7 +7781,11 @@ msgid "Permission"
msgstr ""
#: sundayschool/SundaySchoolClassView.php:38
+<<<<<<< HEAD
#: sundayschool/SundaySchoolDashboard.php:226 menuconfig_mcf.php:13
+=======
+#: sundayschool/SundaySchoolDashboard.php:238 menuconfig_mcf.php:14
+>>>>>>> master
msgid "Sunday School"
msgstr ""
@@ -6785,7 +7804,11 @@ msgstr ""
#: sundayschool/SundaySchoolClassView.php:120
#: sundayschool/SundaySchoolDashboard.php:80
+<<<<<<< HEAD
#: sundayschool/SundaySchoolDashboard.php:146
+=======
+#: sundayschool/SundaySchoolDashboard.php:152
+>>>>>>> master
msgid "Teachers"
msgstr ""
@@ -6808,7 +7831,11 @@ msgstr ""
#: sundayschool/SundaySchoolClassView.php:191
#: sundayschool/SundaySchoolDashboard.php:91
+<<<<<<< HEAD
#: sundayschool/SundaySchoolDashboard.php:147
+=======
+#: sundayschool/SundaySchoolDashboard.php:153
+>>>>>>> master
msgid "Students"
msgstr ""
@@ -6896,6 +7923,7 @@ msgstr ""
msgid "Classes"
msgstr ""
+<<<<<<< HEAD
#: sundayschool/SundaySchoolDashboard.php:173
msgid "Students not in a Sunday School Class"
msgstr ""
@@ -6906,6 +7934,18 @@ msgid "Add"
msgstr ""
#: sundayschool/SundaySchoolDashboard.php:231
+=======
+#: sundayschool/SundaySchoolDashboard.php:179
+msgid "Students not in a Sunday School Class"
+msgstr ""
+
+#: sundayschool/SundaySchoolDashboard.php:238
+#: sundayschool/SundaySchoolDashboard.php:251
+msgid "Add"
+msgstr ""
+
+#: sundayschool/SundaySchoolDashboard.php:243
+>>>>>>> master
msgid "Enter Name"
msgstr ""
@@ -7175,6 +8215,7 @@ msgstr ""
msgid "Failed Logins"
msgstr ""
+<<<<<<< HEAD
#: UserList.php:118
msgid "User Delete Confirmation"
msgstr ""
@@ -7196,6 +8237,29 @@ msgid "Please confirm the password reset of this user"
msgstr ""
#: UserList.php:173
+=======
+#: UserList.php:121
+msgid "User Delete Confirmation"
+msgstr ""
+
+#: UserList.php:123
+msgid "Please confirm removal of user status from:"
+msgstr ""
+
+#: UserList.php:143 UserList.php:164
+msgid "Action Confirmation"
+msgstr ""
+
+#: UserList.php:145
+msgid "Please confirm reset failed login count"
+msgstr ""
+
+#: UserList.php:166
+msgid "Please confirm the password reset of this user"
+msgstr ""
+
+#: UserList.php:176
+>>>>>>> master
msgid "Password reset for"
msgstr ""
@@ -8836,3 +9900,63 @@ msgstr ""
#: userconfig_ucfg.php:8
msgid "Allow user to see member privacy data, e.g. Birth Year, Age."
msgstr ""
+
+msgid "Error making API Call to"
+msgstr ""
+
+msgid "Error text"
+msgstr ""
+
+msgid "Stack Trace"
+msgstr ""
+
+msgid "There was a problem retrieving the requested object"
+msgstr ""
+
+msgid "View all"
+msgstr ""
+
+msgid "Check Number"
+msgstr ""
+
+msgid "Details"
+msgstr ""
+
+msgid "Verification email sent"
+msgstr ""
+
+msgid "Failed to send verification email"
+msgstr ""
+
+msgid "Failed to add verification"
+msgstr ""
+
+msgid "Checking Cart Status"
+msgstr ""
+
+msgid "All members of this group are in the cart"
+msgstr ""
+
+msgid "Remove all"
+msgstr ""
+
+msgid "Not all members of this group are in the cart"
+msgstr ""
+
+msgid "Add all"
+msgstr ""
+
+msgid "Are you sure you want to remove the selected group members?"
+msgstr ""
+
+msgid "Successfully submitted Issue"
+msgstr ""
+
+msgid "View Issue on GitHub"
+msgstr ""
+
+msgid "Do you want to delete this person? This cannot be undone."
+msgstr ""
+
+msgid "Are you sure you want to unassign this property?"
+msgstr ""
diff --git a/locale/update-locale.sh b/locale/update-locale.sh
index 43b5a6ea7b..1fd1750f72 100755
--- a/locale/update-locale.sh
+++ b/locale/update-locale.sh
@@ -8,3 +8,6 @@ cd db-strings
find . -iname "*.php" | sort | xargs xgettext --join-existing --from-code=UTF-8 -o /vagrant/locale/messages.po
cd ..
rm db-strings/*
+i18next-extract-gettext --files='/vagrant/src/skin/js/*.js' --output=/vagrant/locale/js-strings.po
+msgcat /vagrant/locale/messages.po /vagrant/locale/js-strings.po -o /vagrant/locale/messages.po
+rm /vagrant/locale/js-strings.po
\ No newline at end of file
diff --git a/package.json b/package.json
index c594ef92de..dbea1d21b3 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
"jquery-steps": "1.1.0",
"jquery-validation": "1.16.0",
"i18next": "8.2.1",
- "i18next-xhr-backend":"1.4.1"
+ "i18next-xhr-backend": "1.4.1"
},
"scripts": {
"install": "grunt clean && grunt updateVersions && grunt curl-dir && grunt copy && grunt sass",
diff --git a/src/AutoPaymentEditor.php b/src/AutoPaymentEditor.php
index dce728bfe2..ba9cba4f60 100644
--- a/src/AutoPaymentEditor.php
+++ b/src/AutoPaymentEditor.php
@@ -14,6 +14,8 @@
//Include the function library
require 'Include/Config.php';
require 'Include/Functions.php';
+require 'bin/vancowebservices.php';
+
use ChurchCRM\Utils\InputUtils;
use ChurchCRM\dto\SystemConfig;
@@ -24,7 +26,7 @@
//Get Family name
if ($iFamily) {
- $sSQL = 'SELECT * FROM family_fam where fam_ID = '.$iFamily;
+ $sSQL = 'SELECT * FROM family_fam where fam_ID = ' . $iFamily;
$rsFamily = RunQuery($sSQL);
extract(mysqli_fetch_array($rsFamily));
} else {
@@ -92,35 +94,35 @@
aut_Serial,
aut_DateLastEdited,
aut_EditedBy)
- VALUES ('.
- $iFamily.','.
- $bEnableBankDraft.','.
- $bEnableCreditCard.','.
- "'".$dNextPayDate."',".
- "'".$iFYID."',".
- "'".$nAmount."',".
- "'".$iInterval."',".
- "'".$iFund."',".
- "'".$tFirstName."',".
- "'".$tLastName."',".
- "'".$tAddress1."',".
- "'".$tAddress2."',".
- "'".$tCity."',".
- "'".$tState."',".
- "'".$tZip."',".
- "'".$tCountry."',".
- "'".$tPhone."',".
- "'".$tEmail."',".
- "'".$tCreditCard."',".
- "'".$tExpMonth."',".
- "'".$tExpYear."',".
- "'".$tBankName."',".
- "'".$tRoute."',".
- "'".$tAccount."',".
- "'". 1 ."',".
- "'".date('YmdHis')."',".
- $_SESSION['iUserID'].
- ')';
+ VALUES (' .
+ $iFamily . ',' .
+ $bEnableBankDraft . ',' .
+ $bEnableCreditCard . ',' .
+ "'" . $dNextPayDate . "'," .
+ "'" . $iFYID . "'," .
+ "'" . $nAmount . "'," .
+ "'" . $iInterval . "'," .
+ "'" . $iFund . "'," .
+ "\"" . $tFirstName . "\"," .
+ "\"" . $tLastName . "\"," .
+ "\"" . $tAddress1 . "\"," .
+ "\"" . $tAddress2 . "\"," .
+ "\"" . $tCity . "\"," .
+ "\"" . $tState . "\"," .
+ "'" . $tZip . "'," .
+ "\"" . $tCountry . "\"," .
+ "'" . $tPhone . "'," .
+ "'" . $tEmail . "'," .
+ "'" . $tCreditCard . "'," .
+ "'" . $tExpMonth . "'," .
+ "'" . $tExpYear . "'," .
+ "'" . $tBankName . "'," .
+ "'" . $tRoute . "'," .
+ "'" . $tAccount . "'," .
+ "'" . 1 . "'," .
+ "'" . date('YmdHis') . "'," .
+ $_SESSION['iUserID'] .
+ ')';
RunQuery($sSQL);
$sSQL = 'SELECT MAX(aut_ID) AS iAutID FROM autopayment_aut';
@@ -128,7 +130,7 @@
extract(mysqli_fetch_array($rsAutID));
}
-$sPageTitle = gettext('Automatic payment configuration for the '.$fam_Name.' family');
+$sPageTitle = gettext('Automatic payment configuration for the ') . $fam_Name . gettext(' family');
//Is this the second pass?
if (isset($_POST['Submit'])) {
@@ -175,34 +177,34 @@
$tRoute = InputUtils::LegacyFilterInput($_POST['Route']);
$tAccount = InputUtils::LegacyFilterInput($_POST['Account']);
- $sSQL = 'UPDATE autopayment_aut SET '.
- 'aut_FamID = '.$iFamily.','.
- 'aut_EnableBankDraft ='.$bEnableBankDraft.','.
- 'aut_EnableCreditCard ='.$bEnableCreditCard.','.
- "aut_NextPayDate ='".$dNextPayDate."',".
- "aut_Amount ='".$nAmount."',".
- "aut_FYID ='".$iFYID."',".
- "aut_Interval ='".$iInterval."',".
- "aut_Fund ='".$iFund."',".
- "aut_FirstName ='".$tFirstName."',".
- "aut_LastName ='".$tLastName."',".
- "aut_Address1 ='".$tAddress1."',".
- "aut_Address2 ='".$tAddress2."',".
- "aut_City ='".$tCity."',".
- "aut_State ='".$tState."',".
- "aut_Zip ='".$tZip."',".
- "aut_Country ='".$tCountry."',".
- "aut_Phone ='".$tPhone."',".
- "aut_Email ='".$tEmail."',".
- "aut_CreditCard ='".$tCreditCard."',".
- "aut_ExpMonth ='".$tExpMonth."',".
- "aut_ExpYear ='".$tExpYear."',".
- "aut_BankName ='".$tBankName."',".
- "aut_Route ='".$tRoute."',".
- "aut_Account ='".$tAccount."',".
- "aut_DateLastEdited ='".date('YmdHis')."',".
- 'aut_EditedBy ='.$_SESSION['iUserID'].
- ' WHERE aut_ID = '.$iAutID;
+ $sSQL = 'UPDATE autopayment_aut SET ' .
+ 'aut_FamID = ' . $iFamily . ',' .
+ 'aut_EnableBankDraft =' . $bEnableBankDraft . ',' .
+ 'aut_EnableCreditCard =' . $bEnableCreditCard . ',' .
+ "aut_NextPayDate ='" . $dNextPayDate . "'," .
+ "aut_Amount ='" . $nAmount . "'," .
+ "aut_FYID ='" . $iFYID . "'," .
+ "aut_Interval ='" . $iInterval . "'," .
+ "aut_Fund ='" . $iFund . "'," .
+ "aut_FirstName ='" . $tFirstName . "'," .
+ "aut_LastName ='" . $tLastName . "'," .
+ "aut_Address1 ='" . $tAddress1 . "'," .
+ "aut_Address2 ='" . $tAddress2 . "'," .
+ "aut_City ='" . $tCity . "'," .
+ "aut_State ='" . $tState . "'," .
+ "aut_Zip ='" . $tZip . "'," .
+ "aut_Country ='" . $tCountry . "'," .
+ "aut_Phone ='" . $tPhone . "'," .
+ "aut_Email ='" . $tEmail . "'," .
+ "aut_CreditCard ='" . $tCreditCard . "'," .
+ "aut_ExpMonth ='" . $tExpMonth . "'," .
+ "aut_ExpYear ='" . $tExpYear . "'," .
+ "aut_BankName ='" . $tBankName . "'," .
+ "aut_Route ='" . $tRoute . "'," .
+ "aut_Account ='" . $tAccount . "'," .
+ "aut_DateLastEdited ='" . date('YmdHis') . "'," .
+ 'aut_EditedBy =' . $_SESSION['iUserID'] .
+ ' WHERE aut_ID = ' . $iAutID;
RunQuery($sSQL);
if (isset($_POST['Submit'])) {
@@ -211,11 +213,11 @@
Redirect($linkBack);
} else {
//Send to the view of this pledge
- Redirect('AutoPaymentEditor.php?AutID='.$iAutID.'&FamilyID='.$iFamily.'&linkBack=', $linkBack);
+ Redirect('AutoPaymentEditor.php?AutID=' . $iAutID . '&FamilyID=' . $iFamily . '&linkBack=', $linkBack);
}
}
} else { // not submitting, just get ready to build the page
- $sSQL = 'SELECT * FROM autopayment_aut WHERE aut_ID = '.$iAutID;
+ $sSQL = 'SELECT * FROM autopayment_aut WHERE aut_ID = ' . $iAutID;
$rsAutopayment = RunQuery($sSQL);
extract(mysqli_fetch_array($rsAutopayment));
@@ -275,530 +277,731 @@
if (SystemConfig::getValue('sElectronicTransactionProcessor') == 'Vanco') {
?>
-
-
-