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 : 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. ", + " 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') { ?> - - -
+ - +
- - - - - -
- - + + -
- - - - - + + + + - -
: -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + '; - } - ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
: + +
> + > + >
:
: + +
: + +
1
2
+
+
+
>Bank Draft - >Credit Card - >Disable
:
: - -
: -
+
1
2
- 0) { - ?> - - - Save this record to enable storing private data at Vanco - -
-
- - + +
- -

- +

+ -

-

+

\n"; - echo '
'; -} else { + } + echo '

\n"; + echo ''; + } else { // Create array with Classification Information (lst_ID = 1) $sClassSQL = 'SELECT * FROM list_lst WHERE lst_ID=1 ORDER BY lst_OptionSequence'; - $rsClassification = RunQuery($sClassSQL); - unset($aClassificationName); - $aClassificationName[0] = 'Unassigned'; - while ($aRow = mysqli_fetch_array($rsClassification)) { - extract($aRow); - $aClassificationName[intval($lst_OptionID)] = $lst_OptionName; - } + $rsClassification = RunQuery($sClassSQL); + unset($aClassificationName); + $aClassificationName[0] = 'Unassigned'; + while ($aRow = mysqli_fetch_array($rsClassification)) { + extract($aRow); + $aClassificationName[intval($lst_OptionID)] = $lst_OptionName; + } // Create array with Family Role Information (lst_ID = 2) $sFamRoleSQL = 'SELECT * FROM list_lst WHERE lst_ID=2 ORDER BY lst_OptionSequence'; - $rsFamilyRole = RunQuery($sFamRoleSQL); - unset($aFamilyRoleName); - $aFamilyRoleName[0] = 'Unassigned'; - while ($aRow = mysqli_fetch_array($rsFamilyRole)) { - extract($aRow); - $aFamilyRoleName[intval($lst_OptionID)] = $lst_OptionName; - } - - $sSQL = 'SELECT * FROM person_per LEFT JOIN family_fam ON person_per.per_fam_ID = family_fam.fam_ID WHERE per_ID IN ('.ConvertCartToString($_SESSION['aPeopleCart']).') ORDER BY per_LastName'; - $rsCartItems = RunQuery($sSQL); - $iNumPersons = mysqli_num_rows($rsCartItems); - - $sSQL = 'SELECT distinct per_fam_ID FROM person_per LEFT JOIN family_fam ON person_per.per_fam_ID = family_fam.fam_ID WHERE per_ID IN ('.ConvertCartToString($_SESSION['aPeopleCart']).') ORDER BY per_fam_ID'; - $iNumFamilies = mysqli_num_rows(RunQuery($sSQL)); - - if ($iNumPersons > 16) { - ?> -
- -
- + $rsFamilyRole = RunQuery($sFamRoleSQL); + unset($aFamilyRoleName); + $aFamilyRoleName[0] = 'Unassigned'; + while ($aRow = mysqli_fetch_array($rsFamilyRole)) { + extract($aRow); + $aFamilyRoleName[intval($lst_OptionID)] = $lst_OptionName; + } - + $sSQL = 'SELECT * FROM person_per LEFT JOIN family_fam ON person_per.per_fam_ID = family_fam.fam_ID WHERE per_ID IN (' . ConvertCartToString($_SESSION['aPeopleCart']) . ') ORDER BY per_LastName'; + $rsCartItems = RunQuery($sSQL); + $iNumPersons = mysqli_num_rows($rsCartItems); + $sSQL = 'SELECT distinct per_fam_ID FROM person_per LEFT JOIN family_fam ON person_per.per_fam_ID = family_fam.fam_ID WHERE per_ID IN (' . ConvertCartToString($_SESSION['aPeopleCart']) . ') ORDER BY per_fam_ID'; + $iNumFamilies = mysqli_num_rows(RunQuery($sSQL)); - 0) { - ?> -
-
-

Cart Functions

-
-
- - 16) { ?> - - 0) { ?> - - - - - - - - - - +
+

+
+
+ + + + + + + + - // Email Cart links - // Note: This will email entire group, even if a specific role is currently selected. - $sSQL = "SELECT per_Email, fam_Email + + + + + + ".gettext('Email Cart').''; - echo "".gettext('Email (BCC)').''; + if ($bEmailMailto) { // Does user have permission to email groups + // Display link + echo "" . gettext('Email Cart') . ''; + echo "" . gettext('Email (BCC)') . ''; + } } - } - //Text Cart Link - $sSQL = "SELECT per_CellPhone, fam_CellPhone FROM person_per LEFT JOIN family_fam ON person_per.per_fam_ID = family_fam.fam_ID WHERE per_ID NOT IN (SELECT per_ID FROM person_per INNER JOIN record2property_r2p ON r2p_record_ID = per_ID INNER JOIN property_pro ON r2p_pro_ID = pro_ID AND pro_Name = 'Do Not SMS') AND per_ID IN (".ConvertCartToString($_SESSION['aPeopleCart']).')'; - $rsPhoneList = RunQuery($sSQL); - $sPhoneLink = ''; - $sCommaDelimiter = ', '; - - while (list($per_CellPhone, $fam_CellPhone) = mysqli_fetch_row($rsPhoneList)) { - $sPhone = SelectWhichInfo($per_CellPhone, $fam_CellPhone, false); - if ($sPhone) { - /* if ($sPhoneLink) // Don't put delimiter before first phone - $sPhoneLink .= $sCommaDelimiter; */ - // Add phone only if phone is not already in string - if (!stristr($sPhoneLink, $sPhone)) { - $sPhoneLink .= $sPhone .= $sCommaDelimiter; + //Text Cart Link + $sSQL = "SELECT per_CellPhone, fam_CellPhone FROM person_per LEFT JOIN family_fam ON person_per.per_fam_ID = family_fam.fam_ID WHERE per_ID NOT IN (SELECT per_ID FROM person_per INNER JOIN record2property_r2p ON r2p_record_ID = per_ID INNER JOIN property_pro ON r2p_pro_ID = pro_ID AND pro_Name = 'Do Not SMS') AND per_ID IN (" . ConvertCartToString($_SESSION['aPeopleCart']) . ')'; + $rsPhoneList = RunQuery($sSQL); + $sPhoneLink = ''; + $sCommaDelimiter = ', '; + + while (list($per_CellPhone, $fam_CellPhone) = mysqli_fetch_row($rsPhoneList)) { + $sPhone = SelectWhichInfo($per_CellPhone, $fam_CellPhone, false); + if ($sPhone) { + /* if ($sPhoneLink) // Don't put delimiter before first phone + $sPhoneLink .= $sCommaDelimiter; */ + // Add phone only if phone is not already in string + if (!stristr($sPhoneLink, $sPhone)) { + $sPhoneLink .= $sPhone .= $sCommaDelimiter; + } } } - } - if ($sPhoneLink) { - if ($bEmailMailto) { // Does user have permission to email groups + if ($sPhoneLink) { + if ($bEmailMailto) { // Does user have permission to email groups - // Display link - echo 'Text Cart'; - echo ''; - } + // Display link + echo '' . gettext("Text Cart"); + echo ''; + } + } ?> + + + +
+ +
+ + - - - -
- - - - + - -
-
-

-
-
-
- - '; - echo ' '; - - echo ' '; - echo ' '; - - ToParentsOfCheckBox('toparents'); - LabelSelect('labeltype'); - FontSelect('labelfont'); - FontSizeSelect('labelfontsize'); - StartRowStartColumn(); - IgnoreIncompleteAddresses(); - LabelFileType(); ?> - - - - - -
'.gettext('Bulk Mail Presort').''; - echo '
'.gettext('Quiet Presort').''; - echo '
- - - - + + + + - - - - - - 0): ?> -
-
-

- .

-
-
- - + + + + + @@ -290,101 +292,44 @@ function codename() - - - - 0) { - $sEmail = $per_WorkEmail; - } - - if (strlen($sEmail)) { - $sValidEmail = gettext('Yes'); - if (!stristr($sEmailLink, $sEmail)) { - $email_array[] = $sEmail; - - if ($iEmailNum == 0) { - // Comma is not needed before first email address - $sEmailLink .= $sEmail; - $iEmailNum++; - } else { - $sEmailLink .= $sMailtoDelimiter.$sEmail; - } - } - } else { - $sValidEmail = gettext('No'); - } - $sAddress1 = SelectWhichInfo($per_Address1, $fam_Address1, false); - $sAddress2 = SelectWhichInfo($per_Address2, $fam_Address2, false); - - if (strlen($sAddress1) > 0 || strlen($sAddress2) > 0) { - $sValidAddy = gettext('Yes'); - } else { - $sValidAddy = gettext('No'); - } - - $personName = $per_FirstName.' '.$per_LastName; - $thumbnail = SystemURLs::getRootPath().'/api/persons/'.$per_ID.'/thumbnail'; ?> - - - - - - - - - - - - -
-   - - - -
-
-
- - - - + -Deleted Email message succesfuly'; -} -?> + RunQuery($sSQL); + echo 'Deleted Email message succesfuly'; + } + + ?> + + + + 0): ?> +
+
+

+ + .

+
+
+ + diff --git a/src/CheckVersion.php b/src/CheckVersion.php index 52b83a7f0f..7d67770e23 100644 --- a/src/CheckVersion.php +++ b/src/CheckVersion.php @@ -29,6 +29,7 @@ require 'Include/Functions.php'; use ChurchCRM\Service\SystemService; +use ChurchCRM\dto\SystemURLs; $systemService = new SystemService(); if ($systemService->isDBCurrent()) { //either the DB is good, or the upgrade was successful. @@ -85,7 +86,7 @@
    • -
    • +

diff --git a/src/Checkin.php b/src/Checkin.php index 564a70b2e7..7d999c13f7 100644 --- a/src/Checkin.php +++ b/src/Checkin.php @@ -397,15 +397,7 @@ class="direct-chat-img initials-image">  diff --git a/src/FamilyCustomFieldsEditor.php b/src/FamilyCustomFieldsEditor.php index 2cac0e99a6..4c03d7b4f0 100644 --- a/src/FamilyCustomFieldsEditor.php +++ b/src/FamilyCustomFieldsEditor.php @@ -30,6 +30,7 @@ require 'Include/Functions.php'; use ChurchCRM\Utils\InputUtils; +use ChurchCRM\dto\SystemURLs; // Security: user must be administrator to use this page if (!$_SESSION['bAdmin']) { @@ -438,7 +439,7 @@ function confirmDeleteField( Field ) { } echo ''; ?>
- + getPeople() as $person) { - ?> - - - + + - - + } ?>
:
diff --git a/src/FamilyList.php b/src/FamilyList.php index cff2a5426d..253a5ebee9 100644 --- a/src/FamilyList.php +++ b/src/FamilyList.php @@ -84,16 +84,7 @@ diff --git a/src/FamilyView.php b/src/FamilyView.php index 7265d4a256..9aaad55fba 100644 --- a/src/FamilyView.php +++ b/src/FamilyView.php @@ -56,7 +56,7 @@ $family->activate(); } $family->save(); - Redirect("FamilyView.php?FamilyID=". $_POST['FID']); + Redirect("FamilyView.php?FamilyID=" . $_POST['FID']); exit; } // Get the list of funds @@ -66,7 +66,7 @@ if (isset($_POST["UpdatePledgeTable"]) && $_SESSION['bFinance']) { $_SESSION['sshowPledges'] = isset($_POST["ShowPledges"]); $_SESSION['sshowPayments'] = isset($_POST["ShowPayments"]); - $_SESSION['sshowSince'] = DateTime::createFromFormat("Y-m-d", InputUtils::LegacyFilterInput($_POST["ShowSinceDate"])) ; + $_SESSION['sshowSince'] = DateTime::createFromFormat("Y-m-d", InputUtils::LegacyFilterInput($_POST["ShowSinceDate"])); } $dSQL = "SELECT fam_ID FROM family_fam order by fam_Name"; @@ -173,7 +173,7 @@ window.CRM.currentFamily = ; -
@@ -182,31 +182,35 @@ } ?>
-
-
-
- - -
-
- "> - -   - "> - -   - isPhotoLocal()): ?> - "> - - - +
+
+
+ + +
+
+ "> + +   + "> + +   + isPhotoLocal()): ?> + "> + + + +
-
- -
-

- +
+

+ @@ -216,10 +220,10 @@ class="btn btn-primary btn-block">
  • : getAddress() ?>
    + href="http://maps.google.com/?q=getAddress() ?>" + target="_blank">getAddress() ?>
    - if (!SystemConfig::getValue("bHideFamilyNewsletter")) { /* Newsletter can be hidden - General Settings */ ?>
  • : ">">
    • + class="fa fa-"> + @@ -246,31 +251,33 @@ class="fa fa-"> -
  • +
  • +
  • :
    • + href="tel:">
  • :
    • + href="tel:">
  • :
    • + href="tel:"> -
  • : +
  • :
    • isActive()) { ?> @@ -296,53 +303,46 @@ class="fa fa-">
-
-

- - - 0)) { +
+

+ + + 0)) { ?> - - "> + - - 0)) { + + 0)) { ?> - - - - - "> + -
+
- + + class="fa fa-sticky-note"> - + class="fa fa-cart-plus"> - - + +
@@ -363,22 +363,25 @@ class="fa fa-cart-plus">
- - getFullName() ?> - - getFamilyRoleName(); - $labelColor = 'label-default'; - if ($famRole == 'Head of Household') { - } elseif ($famRole == 'Spouse') { - $labelColor = 'label-info'; - } elseif ($famRole == 'Child') { - $labelColor = 'label-warning'; - } ?> + ?> +
+ + getFullName() ?> + + getFamilyRoleName(); + $labelColor = 'label-default'; + if ($famRole == 'Head of Household') { + } elseif ($famRole == 'Spouse') { + $labelColor = 'label-info'; + } elseif ($famRole == 'Child') { + $labelColor = 'label-warning'; + } ?> @@ -387,11 +390,10 @@ class="fa fa-cart-plus"> getEmail(); - if ($tmpEmail != "") { - array_push($sFamilyEmails, $tmpEmail); ?> + if ($tmpEmail != "") { + array_push($sFamilyEmails, $tmpEmail); ?> @@ -401,25 +403,22 @@ class="fa fa-cart-plus"> + ?> - + -
@@ -437,13 +436,18 @@ class="fa fa-cart-plus"> + ?>
    • + ?> + + @@ -492,14 +496,16 @@ class="fa fa-cart-plus"> "> - + "> - + @@ -600,24 +606,27 @@ class="fa fa-cart-plus"> :
    -
    -
    - +
    +
    + +
    +
    + " name="Submit2"> +
    -
    - " name="Submit2"> -
    -
    @@ -690,11 +699,11 @@ class="fa fa-cart-plus"> + href="AutoPaymentEditor.php?AutID=&FamilyID=&linkBack=FamilyView.php?FamilyID="> + href="AutoPaymentDelete.php?AutID=&linkBack=FamilyView.php?FamilyID=">   @@ -735,27 +744,28 @@ class="fa fa-cart-plus"> - name="UpdatePledgeTable" + + name="UpdatePledgeTable" style="font-size: 8pt;"> - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -783,7 +793,7 @@ class="fa fa-cart-plus"> $_SESSION['sshowSince']) + ($_SESSION['sshowSince'] == "" || DateTime::createFromFormat("Y-m-d", $plg_date) > $_SESSION['sshowSince']) ) { ?> @@ -817,11 +827,11 @@ class="fa fa-cart-plus"> + + diff --git a/src/GeoPage.php b/src/GeoPage.php index d51779773e..38fbf09d7a 100644 --- a/src/GeoPage.php +++ b/src/GeoPage.php @@ -262,7 +262,7 @@ class="control-label col-xs-12 col-sm-3 col-md-3 col-lg-3">
    diff --git a/src/GroupPropsFormEditor.php b/src/GroupPropsFormEditor.php index cc91f0a31b..f5624c9955 100644 --- a/src/GroupPropsFormEditor.php +++ b/src/GroupPropsFormEditor.php @@ -19,6 +19,7 @@ require 'Include/Functions.php'; use ChurchCRM\Utils\InputUtils; +use ChurchCRM\dto\SystemURLs; // Security: user must be allowed to edit records to use this page. if (!$_SESSION['bManageGroups']) { @@ -390,7 +391,7 @@ } echo ''; ?>
    - +
    - + -
    Edit + href="PledgeEditor.php?GroupKey=&linkBack=FamilyView.php?FamilyID=">Edit Delete + href="PledgeDelete.php?GroupKey=&linkBack=FamilyView.php?FamilyID=">Delete   @@ -868,11 +878,11 @@ class="fa fa-cart-plus"> - -
    + +
    - @@ -948,24 +960,24 @@ class="btn btn-success"> Meanwhile, you may") ?> + href="/MembersDashboard.php">

    - + } ?> + } ?> +
    :
    diff --git a/src/Include/Footer.php b/src/Include/Footer.php index d3d1b97737..a047c3dd59 100644 --- a/src/Include/Footer.php +++ b/src/Include/Footer.php @@ -271,6 +271,7 @@ + @@ -293,16 +294,16 @@ + + - - - + diff --git a/src/Include/Functions.php b/src/Include/Functions.php index b83c00c972..a09ed13f7f 100644 --- a/src/Include/Functions.php +++ b/src/Include/Functions.php @@ -997,7 +997,7 @@ function formCustomField($type, $fieldname, $data, $special, $bFirstPassFlag) '
    '. ''. '
    '. - ' '. + ' '. ''; break; @@ -1105,12 +1105,17 @@ function formCustomField($type, $fieldname, $data, $special, $bFirstPassFlag) $bNoFormat_Phone = true; } - echo ''; + echo '
    '; + echo '
    '; + echo ''; + echo '
    '; + echo ''; echo '
    '.gettext('Do not auto-format'); + echo '
    '; break; // Handler for custom lists diff --git a/src/Include/Header-function.php b/src/Include/Header-function.php index 07a56d4bac..1ff370785c 100644 --- a/src/Include/Header-function.php +++ b/src/Include/Header-function.php @@ -37,13 +37,13 @@ function Header_system_notifications() { if (NotificationService::hasActiveNotifications()) { ?> -
    - link."\">".$notification->title.""; - } ?> -
    - + link . "\">" . $notification->title . ""; + } ?> + +
    @@ -87,7 +87,7 @@ function Header_modals()
    + for="issueDescription">
    @@ -120,15 +120,28 @@ function Header_body_scripts() global $localeInfo; $systemService = new SystemService(); ?> - +
  • - +
    • diff --git a/src/KioskManager.php b/src/KioskManager.php index f44e25cbcd..c8c78ddb1e 100644 --- a/src/KioskManager.php +++ b/src/KioskManager.php @@ -113,7 +113,7 @@ function renderKioskAssignment(data) { $(document).ready(function(){ window.CRM.kioskDataTable = $("#KioskTable").DataTable({ "language": { - "url": window.CRM.root + "/skin/locale/datatables/" + window.CRM.locale + ".json" + "url": window.CRM.plugin.dataTable.language.url }, responsive: true, ajax: { diff --git a/src/ListEvents.php b/src/ListEvents.php index 11d6a1b079..5ed08a0d07 100644 --- a/src/ListEvents.php +++ b/src/ListEvents.php @@ -357,16 +357,7 @@ diff --git a/src/Login.php b/src/Login.php index 4f622cc04f..9ecc36d882 100644 --- a/src/Login.php +++ b/src/Login.php @@ -143,9 +143,6 @@ } - - - // Set the page title and include HTML header $sPageTitle = gettext('Login'); require 'Include/HeaderNotLoggedIn.php'; @@ -186,35 +183,30 @@ -
    +
    - - +
    -
    - -
    -
    +
    + class="fa fa-sign-in">
    -
    -
    + - +
    diff --git a/src/Menu.php b/src/Menu.php index 0ca8bfa4ea..57308488cf 100644 --- a/src/Menu.php +++ b/src/Menu.php @@ -194,6 +194,12 @@

    +
    + + +
    @@ -229,6 +235,12 @@

    +
    + + +
    diff --git a/src/PersonCustomFieldsEditor.php b/src/PersonCustomFieldsEditor.php index cf52236df5..2b4e8693b0 100644 --- a/src/PersonCustomFieldsEditor.php +++ b/src/PersonCustomFieldsEditor.php @@ -18,6 +18,7 @@ require 'Include/Functions.php'; use ChurchCRM\Utils\InputUtils; +use ChurchCRM\dto\SystemURLs; // Security: user must be administrator to use this page if (!$_SESSION['bAdmin']) { @@ -439,7 +440,7 @@ function confirmDeleteField(event) { } echo ''; ?>
    - +
    :
    diff --git a/src/PersonView.php b/src/PersonView.php index f20fe8c02f..204758c617 100644 --- a/src/PersonView.php +++ b/src/PersonView.php @@ -267,24 +267,28 @@ class="initials-image profile-user-img img-responsive img-rounded profile-user-i echo gettext('(No assigned family)'); } ?> +
  • :
    • - +
  • : hideAge()) { - ?> + ?> ( getBirthDate(), $per_Flags) ?>) + } ?>
  • :
    • -    +    getId() != $_SESSION['user']->getId()) { ?> - - getId() ?>, 'getPerson()->getFullName() ?>')"> + getPerson()->getFullName() ?> + getPerson()->getFullName() ?> + getLastLogin(SystemConfig::getValue('sDateFormatShort')) ?> getLoginCount() ?> isLocked()) { ?> getFailedLogins() ?> - getFailedLogins(); } - if ($user->getFailedLogins()> 0) { + if ($user->getFailedLogins() > 0) { ?> - - getId() ?>, 'getPerson()->getFullName() ?>')"> + -    +    getId() != $_SESSION['user']->getId() && !empty($user->getEmail())) { ?> - - getId() ?>, 'getPerson()->getFullName() ?>')"> +
    @@ -106,18 +113,14 @@ diff --git a/src/composer.json b/src/composer.json index 445091d870..501422b2a0 100644 --- a/src/composer.json +++ b/src/composer.json @@ -24,9 +24,9 @@ "support": { "email": "info@churchcrm.io", "issues": "https://github.com/ChurchCRM/CRM/issues", - "irc": "http://webchat.freenode.net/?randomnick=1&channels=ChurchCRM&prompt=1&uio=d4", + "irc": "https://gitter.im/ChurchCRM/CRM", "source": "https://github.com/ChurchCRM/CRM", - "docs": "http://docs.churchcrm.io" + "docs": "https://github.com/ChurchCRM/CRM/wiki" }, "require": { "php": ">=5.6.0", diff --git a/src/email/Dashboard.php b/src/email/Dashboard.php index 8c6037c0b0..bf26226774 100644 --- a/src/email/Dashboard.php +++ b/src/email/Dashboard.php @@ -15,7 +15,9 @@ require '../Include/Config.php'; require '../Include/Functions.php'; + use ChurchCRM\Service\MailChimpService; +use ChurchCRM\dto\SystemURLs; $mailchimp = new MailChimpService(); @@ -95,7 +97,7 @@

    MailChimp

    MailChimp ') ?>, - sMailChimpApiKey. MailChimp + sMailChimpApiKey. MailChimp
    diff --git a/src/external/templates/verify/verify-family-info.php b/src/external/templates/verify/verify-family-info.php index 9347afdbac..826d5f2a7c 100644 --- a/src/external/templates/verify/verify-family-info.php +++ b/src/external/templates/verify/verify-family-info.php @@ -2,6 +2,7 @@ use ChurchCRM\dto\SystemURLs; use ChurchCRM\ListOptionQuery; use ChurchCRM\dto\SystemConfig; +use ChurchCRM\dto\ChurchMetaData; // Set the page title and include HTML header $sPageTitle = gettext("Family Verification"); @@ -23,9 +24,12 @@

    getName() ?>

    ">getAddress() ?>
    - "> getHomePhone() ?>
    - ">getEmail() ?>
    - getHomePhone())) { ?> + "> (H) getHomePhone() ?>
    + getEmail())) { ?> + ">getEmail() ?>
    + getWeddingDate() !== null) { ?> ">getWeddingDate()->format(SystemConfig::getValue("sDateFormatLong")) ?>
    @@ -67,11 +71,17 @@ class="fa fa-fw fa-isMale() ? "male" : "female") ?>">
  • - ">getHomePhone() ?>
    - ">getWorkPhone() ?>
    - ">getCellPhone() ?>
    - ">getEmail() ?>
    - ">getWorkEmail() ?>
    + getHomePhone())) { ?> + ">(H) getHomePhone() ?>
    + getWorkPhone())) { ?> + ">(W) getWorkPhone() ?>
    + getCellPhone())) { ?> + ">(M) getCellPhone() ?>
    + getEmail())) { ?> + ">(H) getEmail() ?>
    + getWorkEmail())) { ?> + ">(W) getWorkEmail() ?>
    + getBirthDate()->format("M d Y") ?> hideAge()) { ?> ">
    @@ -87,7 +97,7 @@ class="fa fa-fw fa-isMale() ? "male" : "female") ?>"> getGroup() != null) { $listOption = ListOptionQuery::create()->filterById($groupMembership->getGroup()->getRoleListId())->filterByOptionId($groupMembership->getRoleId())->findOne()->getOptionName(); ?> - getGroup()->getName() ?>: + getGroup()->getName() ?>:
    isMale() ? "male" : "female") ?>"> - +
    • diff --git a/src/locale/de_DE/LC_MESSAGES/messages.po b/src/locale/de_DE/LC_MESSAGES/messages.po index 212e1fca30..8d0b10140e 100644 --- a/src/locale/de_DE/LC_MESSAGES/messages.po +++ b/src/locale/de_DE/LC_MESSAGES/messages.po @@ -21,8 +21,13 @@ msgstr "Bestätigen sie das automatische Löschen der Zahlung" #: DonationFundEditor.php:186 EditEventAttendees.php:76 #: ElectronicPaymentList.php:222 ElectronicPaymentList.php:288 #: EventNames.php:305 FamilyCustomFieldsEditor.php:334 +<<<<<<< HEAD #: FamilyCustomFieldsEditor.php:392 FamilyView.php:645 FamilyView.php:697 #: FamilyView.php:755 FamilyView.php:892 FindDepositSlip.php:108 +======= +#: FamilyCustomFieldsEditor.php:392 FamilyView.php:661 FamilyView.php:713 +#: FamilyView.php:772 FamilyView.php:909 FindDepositSlip.php:108 +>>>>>>> master #: FundRaiserEditor.php:204 ListEvents.php:250 PaddleNumList.php:60 #: PersonCustomFieldsEditor.php:318 PersonCustomFieldsEditor.php:387 #: PersonView.php:908 PledgeDelete.php:57 PropertyList.php:69 @@ -31,11 +36,19 @@ msgstr "Bestätigen sie das automatische Löschen der Zahlung" msgid "Delete" msgstr "Löschen" +<<<<<<< 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 @@ -43,17 +56,29 @@ msgstr "Löschen" #: 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 "Abbrechen" +<<<<<<< HEAD #: AutoPaymentEditor.php:131 msgid "Automatic payment configuration for the " msgstr "Einstellungen für das automatische Zahlen" #: AutoPaymentEditor.php:582 CanvassEditor.php:242 DepositSlipEditor.php:98 +======= +#: AutoPaymentEditor.php:133 +msgid "Automatic payment configuration for the " +msgstr "Einstellungen für das automatische Zahlen" + +#: 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 @@ -66,7 +91,11 @@ msgstr "Einstellungen für das automatische Zahlen" msgid "Save" msgstr "Speichern" +<<<<<<< HEAD #: AutoPaymentEditor.php:599 BatchWinnerEntry.php:87 BatchWinnerEntry.php:99 +======= +#: AutoPaymentEditor.php:808 BatchWinnerEntry.php:87 BatchWinnerEntry.php:99 +>>>>>>> master #: 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 @@ -78,6 +107,7 @@ msgstr "Speichern" msgid "Unassigned" msgstr "nicht zugeordnet" +<<<<<<< HEAD #: AutoPaymentEditor.php:619 msgid "Automatic payment type" msgstr "Automatische Zahlungsart" @@ -91,36 +121,71 @@ msgid "Payment interval (months)" msgstr "Zahlungsintervall (Monate)" #: AutoPaymentEditor.php:657 CartToGroup.php:80 EditEventTypes.php:91 +======= +#: AutoPaymentEditor.php:828 +msgid "Automatic payment type" +msgstr "Automatische Zahlungsart" + +#: AutoPaymentEditor.php:858 +msgid "Payment amount" +msgstr "Zahlbetrag" + +#: AutoPaymentEditor.php:863 +msgid "Payment interval (months)" +msgstr "Zahlungsintervall (Monate)" + +#: 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 "Keine" +<<<<<<< HEAD #: AutoPaymentEditor.php:670 msgid "inactive" msgstr "inaktiv" #: AutoPaymentEditor.php:700 CartToFamily.php:249 CSVExport.php:115 +======= +#: AutoPaymentEditor.php:884 +msgid "inactive" +msgstr "inaktiv" + +#: 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 "Stadt" +<<<<<<< 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 "Bundesland" +<<<<<<< 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 "Land" +<<<<<<< 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 @@ -128,30 +193,48 @@ msgstr "Land" msgid "Phone" msgstr "Tel." +<<<<<<< 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 "Email" +<<<<<<< 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 "Kreditkarte" +<<<<<<< HEAD #: AutoPaymentEditor.php:745 msgid "Expiration Month" msgstr "Auslaufmonat" @@ -169,6 +252,25 @@ msgid "Bank Route Number" msgstr "BLZ" #: AutoPaymentEditor.php:765 +======= +#: AutoPaymentEditor.php:969 +msgid "Expiration Month" +msgstr "Auslaufmonat" + +#: AutoPaymentEditor.php:975 +msgid "Expiration Year" +msgstr "Ablaufjahr" + +#: AutoPaymentEditor.php:981 +msgid "Bank Name" +msgstr "Bankname" + +#: AutoPaymentEditor.php:987 +msgid "Bank Route Number" +msgstr "BLZ" + +#: AutoPaymentEditor.php:993 +>>>>>>> master msgid "Bank Account Number" msgstr "Kontonummer" @@ -237,10 +339,17 @@ msgstr "Geben Gewinner" msgid "CSV Export" msgstr "CSV Export" +<<<<<<< HEAD #: AutoPaymentEditor.php:685 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:182 +======= +#: 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 +>>>>>>> master #, fuzzy msgid "Last Name" msgstr "Nachnahme/Familienname" @@ -249,10 +358,17 @@ msgstr "Nachnahme/Familienname" msgid "Required" msgstr "Erforderlich" +<<<<<<< HEAD #: AutoPaymentEditor.php:680 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:181 +======= +#: 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 +>>>>>>> master #, fuzzy msgid "First Name" msgstr "Vorname" @@ -262,7 +378,11 @@ msgstr "Vorname" msgid "Middle Name" msgstr "Weiterer Vorname" +<<<<<<< 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 @@ -299,7 +419,11 @@ msgstr "Geburts-/Jahrestag" msgid "Age / Years Married" msgstr "Alter/Ehejahre" +<<<<<<< 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 #, fuzzy msgid "Family Role" @@ -445,9 +569,15 @@ msgstr "Nummer des Spendenumschlags" #: 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 @@ -457,8 +587,13 @@ msgid "Home Phone" msgstr "Tel. Privat" #: 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 @@ -466,8 +601,13 @@ msgid "Work Phone" msgstr "Tel. Geschäftlich" #: 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" @@ -479,13 +619,22 @@ msgstr "Email geschäftlich/weitere" #: 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 "Geburtstag" #: 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 "Hochzeitstag:" @@ -517,7 +666,11 @@ msgstr "Hinweis: Trennungen (z.B. Bindestriche) oder das Fehlen derer machen nic msgid "Default country if none specified otherwise" msgstr "Standarteinstellung für das Land, falls nichts agegeben wird" +<<<<<<< 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" @@ -712,11 +865,19 @@ msgstr "Kein Familienname eingegeben!" msgid "Add Cart to Family" msgstr "Korb zur Familie hinzufügen" +<<<<<<< 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 #: EventNames.php:266 FamilyCustomFieldsEditor.php:330 #: FamilyCustomFieldsEditor.php:444 FamilyList.php:43 FamilyView.php:535 +======= +#: 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:330 +#: FamilyCustomFieldsEditor.php:444 FamilyList.php:43 FamilyView.php:548 +>>>>>>> master #: GeoPage.php:385 GroupEditor.php:77 GroupPropsFormEditor.php:284 #: GroupPropsFormEditor.php:396 GroupView.php:321 GroupView.php:355 #: PersonCustomFieldsEditor.php:314 PersonCustomFieldsEditor.php:445 @@ -798,19 +959,27 @@ msgstr "Zur Gruppe hinzufügen" msgid "Create a New Group" msgstr "Neue Gruppe anlegen" -#: CartView.php:42 +#: CartView.php:41 msgid "View Your Cart" msgstr "Korb anzeigen" -#: CartView.php:50 +#: CartView.php:49 msgid "You have no items in your cart." msgstr "Du hast keine Datenelemente im Korb" +<<<<<<< HEAD #: CartView.php:59 msgid "Back to Menu" msgstr "Zurück zum Menü" #: CartView.php:94 +======= +#: CartView.php:58 +msgid "Back to Menu" +msgstr "Zurück zum Menü" + +#: CartView.php:93 +>>>>>>> master msgid "Go To Labels" msgstr "Zur Markierung springen" @@ -818,6 +987,7 @@ msgstr "Zur Markierung springen" msgid "Empty Cart" msgstr "Korb leeren" +<<<<<<< HEAD #: CartView.php:113 Include/Header.php:131 msgid "Empty Cart to Group" msgstr "Korb in Gruppe leeren" @@ -827,6 +997,17 @@ msgid "Empty Cart to Family" msgstr "Korb in Familie leeren" #: CartView.php:121 Include/Header.php:141 +======= +#: CartView.php:114 Include/Header.php:131 +msgid "Empty Cart to Group" +msgstr "Korb in Gruppe leeren" + +#: CartView.php:120 Include/Header.php:136 +msgid "Empty Cart to Family" +msgstr "Korb in Familie leeren" + +#: CartView.php:124 Include/Header.php:141 +>>>>>>> master msgid "Empty Cart to Event" msgstr "Korb in Veranstaltung leeren" @@ -834,7 +1015,11 @@ msgstr "Korb in Veranstaltung leeren" msgid "Map Cart" msgstr "Karte für Korb anzeigen" +<<<<<<< HEAD #: CartView.php:129 +======= +#: CartView.php:135 +>>>>>>> master #, fuzzy msgid "Name Tags" msgstr "Name" @@ -843,11 +1028,16 @@ msgstr "Name" msgid "Email Cart" msgstr "An Korb mailen" +<<<<<<< HEAD #: CartView.php:164 GroupView.php:205 +======= +#: CartView.php:170 GroupView.php:205 +>>>>>>> master #: sundayschool/SundaySchoolClassView.php:100 msgid "Email (BCC)" msgstr "Mailen (BCC)" +<<<<<<< HEAD #: CartView.php:193 msgid "Create Directory From Cart" msgstr "Erstelle Verzeichnis aus Korb" @@ -874,17 +1064,53 @@ msgstr "Person aus" #: 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:200 +msgid "Create Directory From Cart" +msgstr "Erstelle Verzeichnis aus Korb" + +#: CartView.php:224 CartView.php:266 +msgid "Generate Labels" +msgstr "Adressaufkleber herstellen" + +#: CartView.php:232 +msgid "Bulk Mail Presort" +msgstr "Massenmail Vorsortierung" + +#: CartView.php:241 +msgid "Quiet Presort" +msgstr "Im Hintergrund Vorsortieren" + +#: CartView.php:287 +msgid "Your cart contains" +msgstr "Ihr Korb enthält" + +#: CartView.php:287 +msgid "persons from" +msgstr "Person aus" + +#: 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 "Entfernen" +<<<<<<< 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 "Ja" +<<<<<<< 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" @@ -903,7 +1129,11 @@ msgstr "Veranstaltung auswählen zu der Teilnehmer angemeldet werden sollen" msgid "Select Event" msgstr "Veranstaltung auswählen" +<<<<<<< HEAD #: external/templates/verify/verify-family-info.php:140 +======= +#: external/templates/verify/verify-family-info.php:150 +>>>>>>> master msgid "Verify" msgstr "Überprüfen" @@ -944,16 +1174,28 @@ msgstr "Aktion" msgid "No Attendees Assigned to Event" msgstr "Es sind keine Besucher der Veranstaltung zugewiesen" +<<<<<<< HEAD #: Checkin.php:480 Include/Functions.php:1658 Reports/CanvassReports.php:245 +======= +#: Checkin.php:472 Include/Functions.php:1658 Reports/CanvassReports.php:245 +>>>>>>> master #: Reports/VotingMembers.php:88 queryparameteroptions_qpo.php:15 msgid "Member" msgstr "Mitglied" +<<<<<<< HEAD #: Checkin.php:482 ChurchCRM/Service/PersonService.php:38 msgid " of the" msgstr " der" #: Checkin.php:484 ChurchCRM/Service/PersonService.php:40 PersonView.php:267 +======= +#: Checkin.php:474 ChurchCRM/Service/PersonService.php:38 +msgid " of the" +msgstr " der" + +#: Checkin.php:476 ChurchCRM/Service/PersonService.php:40 PersonView.php:267 +>>>>>>> master msgid "(No assigned family)" msgstr "(Keine festegelegte Familie)" @@ -1030,21 +1272,35 @@ msgstr "Welche Rolle hat das Kind?" msgid "Information to Include" msgstr "Informationen zum Einfügen" +<<<<<<< HEAD #: AutoPaymentEditor.php:690 AutoPaymentEditor.php:695 CartToFamily.php:239 #: CartToFamily.php:244 CartView.php:287 CSVExport.php:105 CSVExport.php:110 +======= +#: 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 "Adresse" #: 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" @@ -1054,7 +1310,11 @@ msgstr "Geburtstag:" msgid "Family Home Phone" msgstr "Tel. Familie Privat" +<<<<<<< HEAD #: ChurchCRM/tasks/FamilyWorkPhoneTask.php:30 DirectoryReports.php:181 +======= +#: DirectoryReports.php:181 +>>>>>>> master msgid "Family Work Phone" msgstr "Tel. Familie Geschäftlich" @@ -1063,7 +1323,11 @@ msgid "Family Cell Phone" msgstr "Familie Mobiltel." #: 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 "Familie Email" @@ -1250,11 +1514,19 @@ msgstr "Wiederholungsmuster" msgid "Attendance Counts" msgstr "Teilnehmerzahl" +<<<<<<< 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 @@ -1263,7 +1535,11 @@ msgid "Family" msgstr " Familie" #: ElectronicPaymentList.php:199 FamilyCustomFieldsEditor.php:329 +<<<<<<< HEAD #: FamilyCustomFieldsEditor.php:431 FamilyView.php:534 FamilyView.php:639 +======= +#: FamilyCustomFieldsEditor.php:431 FamilyView.php:547 FamilyView.php:655 +>>>>>>> master #: 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 @@ -1271,19 +1547,32 @@ msgstr " Familie" msgid "Type" msgstr "Typ" +<<<<<<< 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 "Steuerjahr" +<<<<<<< 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 "Betrag" +<<<<<<< HEAD #: AutoPaymentEditor.php:654 ElectronicPaymentList.php:204 FamilyView.php:643 #: FamilyView.php:746 FinancialReports.php:305 SelectDelete.php:215 +======= +#: AutoPaymentEditor.php:868 ElectronicPaymentList.php:204 FamilyView.php:659 +#: FamilyView.php:763 FinancialReports.php:305 SelectDelete.php:215 +>>>>>>> master msgid "Fund" msgstr "Fonds" @@ -1302,8 +1591,13 @@ msgid "Year" msgstr "Jahr" #: 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 @@ -1575,7 +1869,11 @@ msgid "Custom Fields" msgstr "Benutzerdefinierte Felder" #: 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 "Familienmitglieder" @@ -1596,7 +1894,11 @@ msgstr "Mittleres" msgid "Last" msgstr "Letztes" +<<<<<<< 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" @@ -1679,15 +1981,24 @@ msgstr "Unk" msgid "Family View" msgstr "Familienansicht" +<<<<<<< HEAD #: FamilyView.php:232 msgid "Latitude/Longitude" msgstr "Breitengrad/Längengrad" #: FamilyEditor.php:881 FamilyView.php:249 ManageEnvelopes.php:170 +======= +#: FamilyView.php:236 +msgid "Latitude/Longitude" +msgstr "Breitengrad/Längengrad" + +#: FamilyEditor.php:881 FamilyView.php:254 ManageEnvelopes.php:170 +>>>>>>> master #: PledgeEditor.php:528 msgid "Envelope Number" msgstr "Nr. des Briefumschlags" +<<<<<<< HEAD #: FamilyView.php:308 msgid "Previous Family" msgstr "Letzte Familie" @@ -1713,24 +2024,64 @@ msgid "No property assignments." msgstr "Keine Eigenschaften festgelegt:" #: FamilyView.php:536 GroupView.php:356 PersonView.php:655 PrintView.php:451 +======= +#: FamilyView.php:315 +msgid "Previous Family" +msgstr "Letzte Familie" + +#: FamilyView.php:323 +msgid "Next Family" +msgstr "Nächste Familie" + +#: FamilyView.php:199 PersonView.php:197 +msgid "Upload Photo" +msgstr "Foto hochladen" + +#: FamilyView.php:204 PersonView.php:201 +msgid "Delete Photo" +msgstr "Foto löschen" + +#: FamilyView.php:455 +msgid "Pledges and Payments" +msgstr "Zusagen und Zahlungen" + +#: FamilyView.php:540 PersonView.php:647 PrintView.php:446 +msgid "No property assignments." +msgstr "Keine Eigenschaften festgelegt:" + +#: FamilyView.php:549 GroupView.php:356 PersonView.php:655 PrintView.php:451 +>>>>>>> master #: PropertyAssign.php:180 SystemSettings.php:152 msgid "Value" msgstr "Wert" +<<<<<<< HEAD #: FamilyView.php:539 FamilyView.php:577 GroupView.php:359 GroupView.php:395 msgid "Edit Value" msgstr "Wert bearbeiten" #: FamilyView.php:600 PersonView.php:688 +======= +#: FamilyView.php:552 FamilyView.php:590 GroupView.php:359 GroupView.php:395 +msgid "Edit Value" +msgstr "Wert bearbeiten" + +#: FamilyView.php:613 PersonView.php:688 +>>>>>>> master #, fuzzy msgid "Assign a New Property" msgstr "Neue Eingenschaft festlegen" +<<<<<<< HEAD #: FamilyView.php:618 GroupView.php:433 PersonView.php:724 PersonView.php:810 +======= +#: FamilyView.php:634 GroupView.php:433 PersonView.php:724 PersonView.php:810 +>>>>>>> master #: PropertyAssign.php:189 SelectList.php:1081 msgid "Assign" msgstr "Festlegen" +<<<<<<< HEAD #: FamilyView.php:640 msgid "Next payment date" msgstr "Nächster Zahlungstermin" @@ -1769,11 +2120,52 @@ msgstr "Zusage oder Zahlung" #: AutoPaymentEditor.php:632 CanvassEditor.php:198 DepositSlipEditor.php:82 #: EditEventAttendees.php:33 FamilyView.php:748 FindFundRaiser.php:241 +======= +#: FamilyView.php:656 +msgid "Next payment date" +msgstr "Nächster Zahlungstermin" + +#: FamilyView.php:658 +msgid "Interval (months)" +msgstr "Interval (Monaten)" + +#: FamilyView.php:662 FamilyView.php:773 SelectDelete.php:222 +msgid "Date Updated" +msgstr "Aktualisiert am" + +#: FamilyView.php:663 FamilyView.php:774 SelectDelete.php:223 +msgid "Updated By" +msgstr "Aktualisiert durch" + +#: FamilyView.php:729 +msgid "Add a new automatic payment" +msgstr "Eine regelmäßige Zahlung hinzufügen" + +#: FamilyView.php:741 +msgid "Show Pledges" +msgstr "Zeige Zusagen" + +#: FamilyView.php:745 +msgid "Show Payments" +msgstr "Zahlungen anzeigen" + +#: FamilyView.php:754 MemberRoleChange.php:120 PropertyAssign.php:191 +msgid "Update" +msgstr "Aktualisieren" + +#: FamilyView.php:762 +msgid "Pledge or Payment" +msgstr "Zusage oder Zahlung" + +#: 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 "Datum" +<<<<<<< HEAD #: FamilyView.php:750 msgid "NonDeductible" msgstr "nichtabzugsfähig" @@ -1803,6 +2195,37 @@ msgid " Canvass Entry" msgstr "Aktionseintrag" #: DepositSlipEditor.php:223 FamilyView.php:880 FindDepositSlip.php:98 +======= +#: FamilyView.php:767 +msgid "NonDeductible" +msgstr "nichtabzugsfähig" + +#: FamilyView.php:768 SelectDelete.php:219 +msgid "Schedule" +msgstr "Termin" + +#: FamilyView.php:769 SelectDelete.php:220 +msgid "Method" +msgstr "Methode" + +#: FamilyView.php:770 PledgeEditor.php:725 SelectDelete.php:221 +msgid "Comment" +msgstr "Kommentar" + +#: FamilyView.php:862 +msgid "Add a new pledge" +msgstr "Eine neue Spendenzusage hinzufügen" + +#: FamilyView.php:864 +msgid "Add a new payment" +msgstr "Eine neue Zahlung hinzufügen" + +#: FamilyView.php:875 +msgid " Canvass Entry" +msgstr "Aktionseintrag" + +#: DepositSlipEditor.php:223 FamilyView.php:897 FindDepositSlip.php:98 +>>>>>>> master #: PersonView.php:897 PledgeDelete.php:23 msgid "Confirm Delete" msgstr "Löschen bestätigen" @@ -2386,7 +2809,11 @@ msgstr "Gruppenspezifische Einstellungen" msgid "Disabled for this group." msgstr "Ausgeschaltet für diese Gruppe." +<<<<<<< HEAD #: FamilyView.php:438 GroupView.php:342 PersonView.php:382 PrintView.php:435 +======= +#: FamilyView.php:449 GroupView.php:342 PersonView.php:382 PrintView.php:435 +>>>>>>> master #, fuzzy msgid "Assigned Properties" msgstr "Eigenschaften festlegen" @@ -2448,6 +2875,7 @@ msgstr "Ungültiges Passwort" msgid "Too many failed logins: your account has been locked. Please contact an administrator." msgstr "Zu viele fehlgeschlagene Anmeldungen: Dein Konto wurde gesperrt. Melde dich bei dem Administrator." +<<<<<<< HEAD #: Login.php:162 msgid "Please Login" msgstr "Bitte anmelden" @@ -2457,6 +2885,17 @@ msgid "Password" msgstr "Passwort" #: Login.php:150 Login.php:207 +======= +#: Login.php:159 +msgid "Please Login" +msgstr "Bitte anmelden" + +#: BackupDatabase.php:76 Login.php:184 UserList.php:56 +msgid "Password" +msgstr "Passwort" + +#: Login.php:147 Login.php:198 +>>>>>>> master msgid "Login" msgstr "Anmelden" @@ -2468,8 +2907,13 @@ msgstr "Spendenumschlag Manager" msgid "Update Family Records" msgstr "Familieneintrag aktualisieren" +<<<<<<< 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 "Bestätigen" @@ -2538,7 +2982,11 @@ msgid "US Address Verification Report" msgstr "Bericht zur US Adressüberprüfung " #: 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" @@ -2885,7 +3333,11 @@ msgstr "Druckergerechte Ansicht" #: PrintView.php:325 Reports/CanvassReports.php:244 #: sundayschool/SundaySchoolClassView.php:201 +<<<<<<< HEAD #: sundayschool/SundaySchoolDashboard.php:184 +======= +#: sundayschool/SundaySchoolDashboard.php:196 +>>>>>>> master msgid "Age" msgstr "Alter" @@ -2906,7 +3358,7 @@ msgstr "Notizen:" msgid "Entered:" msgstr "Eingegeben:" -#: ChurchCRM/Service/TimelineService.php:124 PrintView.php:484 +#: ChurchCRM/Service/TimelineService.php:126 PrintView.php:484 msgid "by" msgstr "von" @@ -3016,8 +3468,13 @@ msgid "Add a New Property Type" msgstr "Neuen Eigenschaftstyp hinzufügen" #: 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 "Klasse" @@ -3211,7 +3668,11 @@ msgstr "Lösche Familieneinträge und Familienmitglieder" msgid "Person Listing" msgstr "Auflistung der Personen" +<<<<<<< HEAD #: SelectList.php:184 menuconfig_mcf.php:12 +======= +#: SelectList.php:184 menuconfig_mcf.php:13 +>>>>>>> master msgid "Group Assignment Helper" msgstr "Gruppen Assistent" @@ -3323,11 +3784,19 @@ msgstr "Kalenderjahr" msgid "US Address Verification" msgstr "US Adressüberprüfung" +<<<<<<< HEAD #: UserList.php:118 msgid "User Delete Confirmation" msgstr "Bestätigung Benutzer löschen" #: UserList.php:120 +======= +#: UserList.php:121 +msgid "User Delete Confirmation" +msgstr "Bestätigung Benutzer löschen" + +#: UserList.php:123 +>>>>>>> master msgid "Please confirm removal of user status from:" msgstr "Bitte bestätige die Entfernung des Benutzerstatus von:" @@ -3500,7 +3969,11 @@ msgstr "Neues Passwort" msgid "Confirm New Password" msgstr "Passwort bestätigen" +<<<<<<< HEAD #: UserList.php:163 +======= +#: UserList.php:166 +>>>>>>> master #, fuzzy msgid "Please confirm the password reset of this user" msgstr "Bitte bestätige die Zurücksetzung des PW dieses Benutzers" @@ -3840,8 +4313,13 @@ msgstr "Freundschaft" msgid "City, State, Zip" msgstr "Stadt, Bundesland, Postleitzahl" +<<<<<<< HEAD #: 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:40 FamilyEditor.php:787 +#: FamilyView.php:241 Reports/ConfirmReportEmail.php:144 +>>>>>>> master #: Reports/ConfirmReport.php:145 msgid "Send Newsletter" msgstr "Newsletter zuschicken" diff --git a/src/locale/en_AU/LC_MESSAGES/messages.po b/src/locale/en_AU/LC_MESSAGES/messages.po index ed6075e714..3c783ac202 100644 --- a/src/locale/en_AU/LC_MESSAGES/messages.po +++ b/src/locale/en_AU/LC_MESSAGES/messages.po @@ -7,7 +7,11 @@ msgstr "" "Project-Id-Version: ChurchCRM\n" "Language: en-au\n" +<<<<<<< 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 diff --git a/src/locale/en_CA/LC_MESSAGES/messages.po b/src/locale/en_CA/LC_MESSAGES/messages.po index 8bde3ee6e4..6c1a40d7c4 100644 --- a/src/locale/en_CA/LC_MESSAGES/messages.po +++ b/src/locale/en_CA/LC_MESSAGES/messages.po @@ -7,14 +7,22 @@ msgstr "" "Project-Id-Version: ChurchCRM\n" "Language: en-ca\n" +<<<<<<< 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 "Province" +<<<<<<< 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 diff --git a/src/locale/en_GB/LC_MESSAGES/messages.po b/src/locale/en_GB/LC_MESSAGES/messages.po index b10a892c62..51be61b98d 100644 --- a/src/locale/en_GB/LC_MESSAGES/messages.po +++ b/src/locale/en_GB/LC_MESSAGES/messages.po @@ -7,14 +7,22 @@ msgstr "" "Project-Id-Version: ChurchCRM\n" "Language: en\n" +<<<<<<< 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 "County" +<<<<<<< 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 diff --git a/src/locale/en_US/LC_MESSAGES/messages.mo b/src/locale/en_US/LC_MESSAGES/messages.mo new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/locale/en_US/LC_MESSAGES/messages.po b/src/locale/en_US/LC_MESSAGES/messages.po new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/locale/es_ES/LC_MESSAGES/messages.po b/src/locale/es_ES/LC_MESSAGES/messages.po index 913375732c..c263b0295e 100644 --- a/src/locale/es_ES/LC_MESSAGES/messages.po +++ b/src/locale/es_ES/LC_MESSAGES/messages.po @@ -21,8 +21,13 @@ msgstr "Confirmar la Eliminación del Pago Automático" #: DonationFundEditor.php:186 EditEventAttendees.php:76 #: ElectronicPaymentList.php:222 ElectronicPaymentList.php:288 #: EventNames.php:305 FamilyCustomFieldsEditor.php:334 +<<<<<<< HEAD #: FamilyCustomFieldsEditor.php:392 FamilyView.php:645 FamilyView.php:697 #: FamilyView.php:755 FamilyView.php:892 FindDepositSlip.php:108 +======= +#: FamilyCustomFieldsEditor.php:392 FamilyView.php:661 FamilyView.php:713 +#: FamilyView.php:772 FamilyView.php:909 FindDepositSlip.php:108 +>>>>>>> master #: FundRaiserEditor.php:204 ListEvents.php:250 PaddleNumList.php:60 #: PersonCustomFieldsEditor.php:318 PersonCustomFieldsEditor.php:387 #: PersonView.php:908 PledgeDelete.php:57 PropertyList.php:69 @@ -31,11 +36,19 @@ msgstr "Confirmar la Eliminación del Pago Automático" msgid "Delete" msgstr "Borrar" +<<<<<<< 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 @@ -43,17 +56,29 @@ msgstr "Borrar" #: 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 "Cancelar" +<<<<<<< HEAD #: AutoPaymentEditor.php:131 msgid "Automatic payment configuration for the " msgstr "Ajuste de Pago Automático para " #: AutoPaymentEditor.php:582 CanvassEditor.php:242 DepositSlipEditor.php:98 +======= +#: AutoPaymentEditor.php:133 +msgid "Automatic payment configuration for the " +msgstr "Ajuste de Pago Automático para " + +#: 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 @@ -66,7 +91,11 @@ msgstr "Ajuste de Pago Automático para " msgid "Save" msgstr "Guardar" +<<<<<<< HEAD #: AutoPaymentEditor.php:599 BatchWinnerEntry.php:87 BatchWinnerEntry.php:99 +======= +#: AutoPaymentEditor.php:808 BatchWinnerEntry.php:87 BatchWinnerEntry.php:99 +>>>>>>> master #: 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 @@ -78,6 +107,7 @@ msgstr "Guardar" msgid "Unassigned" msgstr "Sin Asignar" +<<<<<<< HEAD #: AutoPaymentEditor.php:619 msgid "Automatic payment type" msgstr "Tipo de Pago Automático" @@ -91,36 +121,71 @@ msgid "Payment interval (months)" msgstr "Intervalo de Pagos (meses)" #: AutoPaymentEditor.php:657 CartToGroup.php:80 EditEventTypes.php:91 +======= +#: AutoPaymentEditor.php:828 +msgid "Automatic payment type" +msgstr "Tipo de Pago Automático" + +#: AutoPaymentEditor.php:858 +msgid "Payment amount" +msgstr "Cantidad a Pagar" + +#: AutoPaymentEditor.php:863 +msgid "Payment interval (months)" +msgstr "Intervalo de Pagos (meses)" + +#: 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 "Nada" +<<<<<<< HEAD #: AutoPaymentEditor.php:670 msgid "inactive" msgstr "Inactivo" #: AutoPaymentEditor.php:700 CartToFamily.php:249 CSVExport.php:115 +======= +#: AutoPaymentEditor.php:884 +msgid "inactive" +msgstr "Inactivo" + +#: 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 "Ciudad" +<<<<<<< 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 "Estado" +<<<<<<< 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 "País" +<<<<<<< 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 @@ -128,30 +193,48 @@ msgstr "País" msgid "Phone" msgstr "Telefono" +<<<<<<< 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 "Email" +<<<<<<< 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 "Tarjeta de Crédito" +<<<<<<< HEAD #: AutoPaymentEditor.php:737 msgid "Vanco Credit Card Method" msgstr "Método Vanco para Tarjeta de Crédito" @@ -177,6 +260,33 @@ msgid "Bank Account Number" msgstr "Numero de Cuenta del Banco" #: AutoPaymentEditor.php:772 +======= +#: AutoPaymentEditor.php:960 +msgid "Vanco Credit Card Method" +msgstr "Método Vanco para Tarjeta de Crédito" + +#: AutoPaymentEditor.php:969 +msgid "Expiration Month" +msgstr "Mes de Expiración" + +#: AutoPaymentEditor.php:975 +msgid "Expiration Year" +msgstr "Año de Expiración" + +#: AutoPaymentEditor.php:981 +msgid "Bank Name" +msgstr "Banco" + +#: AutoPaymentEditor.php:987 +msgid "Bank Route Number" +msgstr "Numero de Ruta del Banco" + +#: AutoPaymentEditor.php:993 +msgid "Bank Account Number" +msgstr "Numero de Cuenta del Banco" + +#: AutoPaymentEditor.php:1001 +>>>>>>> master msgid "Vanco Bank Account Method" msgstr "Método Vanco para Cuenta Bancaria" @@ -260,10 +370,17 @@ msgstr "Exportar a CSV" msgid "Field Selection" msgstr "Seleccionar Campo" +<<<<<<< HEAD #: AutoPaymentEditor.php:685 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:182 +======= +#: 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 +>>>>>>> master msgid "Last Name" msgstr "Apellidos" @@ -271,10 +388,17 @@ msgstr "Apellidos" msgid "Required" msgstr "Requerido" +<<<<<<< HEAD #: AutoPaymentEditor.php:680 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:181 +======= +#: 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 +>>>>>>> master msgid "First Name" msgstr "Nombre" @@ -282,7 +406,11 @@ msgstr "Nombre" msgid "Middle Name" msgstr "Segundo Nombre" +<<<<<<< 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 @@ -313,7 +441,11 @@ msgstr "Fecha de Cumpleaños / Aniversario" msgid "Age / Years Married" msgstr "Años de Casados" +<<<<<<< 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 "Rol Familiar" @@ -457,9 +589,15 @@ msgstr "Sobre de donativo" #: 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 @@ -469,8 +607,13 @@ msgid "Home Phone" msgstr "Teléfono Hogar" #: 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 @@ -478,8 +621,13 @@ msgid "Work Phone" msgstr "Telefono Trabajo" #: 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" @@ -491,13 +639,22 @@ msgstr "Trabajo / Otro Email" #: 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 "Fecha de Nacimiento" #: 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 "Fecha de Matrimonio" @@ -529,7 +686,11 @@ msgstr "NOTA: Separadores (guiones, etc) o falta de ella, no importa" msgid "Default country if none specified otherwise" msgstr "País por defecto si no se especifica lo contrario" +<<<<<<< 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" @@ -759,11 +920,19 @@ msgstr "No ha ingresado el apellido de la familia!" msgid "Add Cart to Family" msgstr "Añadir el Separador a Familia" +<<<<<<< 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 #: EventNames.php:266 FamilyCustomFieldsEditor.php:330 #: FamilyCustomFieldsEditor.php:444 FamilyList.php:43 FamilyView.php:535 +======= +#: 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:330 +#: FamilyCustomFieldsEditor.php:444 FamilyList.php:43 FamilyView.php:548 +>>>>>>> master #: GeoPage.php:385 GroupEditor.php:77 GroupPropsFormEditor.php:284 #: GroupPropsFormEditor.php:396 GroupView.php:321 GroupView.php:355 #: PersonCustomFieldsEditor.php:314 PersonCustomFieldsEditor.php:445 @@ -842,19 +1011,27 @@ msgstr "Agregar al Grupo" msgid "Create a New Group" msgstr "Crear Nuevo Grupo" -#: CartView.php:42 +#: CartView.php:41 msgid "View Your Cart" msgstr "Ver el Separador" -#: CartView.php:50 +#: CartView.php:49 msgid "You have no items in your cart." msgstr "No tiene artículos en su Separador." +<<<<<<< HEAD #: CartView.php:59 msgid "Back to Menu" msgstr "Regresar al Menu" #: CartView.php:94 +======= +#: CartView.php:58 +msgid "Back to Menu" +msgstr "Regresar al Menu" + +#: CartView.php:93 +>>>>>>> master msgid "Go To Labels" msgstr "Ir a Etiquetas" @@ -862,6 +1039,7 @@ msgstr "Ir a Etiquetas" msgid "Empty Cart" msgstr "Vaciar Separador" +<<<<<<< HEAD #: CartView.php:113 Include/Header.php:131 msgid "Empty Cart to Group" msgstr "Vaciar Separador a Grupo" @@ -871,6 +1049,17 @@ msgid "Empty Cart to Family" msgstr "Vaciar Separador a Familia" #: CartView.php:121 Include/Header.php:141 +======= +#: CartView.php:114 Include/Header.php:131 +msgid "Empty Cart to Group" +msgstr "Vaciar Separador a Grupo" + +#: CartView.php:120 Include/Header.php:136 +msgid "Empty Cart to Family" +msgstr "Vaciar Separador a Familia" + +#: CartView.php:124 Include/Header.php:141 +>>>>>>> master msgid "Empty Cart to Event" msgstr "Vaciar Separador a Evento" @@ -878,7 +1067,11 @@ msgstr "Vaciar Separador a Evento" msgid "Map Cart" msgstr "Separador Mapa" +<<<<<<< HEAD #: CartView.php:129 +======= +#: CartView.php:135 +>>>>>>> master msgid "Name Tags" msgstr "Nombre de Etiquetas" @@ -886,11 +1079,16 @@ msgstr "Nombre de Etiquetas" msgid "Email Cart" msgstr "Enviar Separador por Email" +<<<<<<< HEAD #: CartView.php:164 GroupView.php:205 +======= +#: CartView.php:170 GroupView.php:205 +>>>>>>> master #: sundayschool/SundaySchoolClassView.php:100 msgid "Email (BCC)" msgstr "Email (BCC)" +<<<<<<< HEAD #: CartView.php:193 msgid "Create Directory From Cart" msgstr "Crear directorio desde separador" @@ -917,17 +1115,53 @@ msgstr "personas de" #: 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:200 +msgid "Create Directory From Cart" +msgstr "Crear directorio desde separador" + +#: CartView.php:224 CartView.php:266 +msgid "Generate Labels" +msgstr "Generar Etiquetas" + +#: CartView.php:232 +msgid "Bulk Mail Presort" +msgstr "Lotes de correo Presort" + +#: CartView.php:241 +msgid "Quiet Presort" +msgstr "Organizar sin notificaciones" + +#: CartView.php:287 +msgid "Your cart contains" +msgstr "Su Separador contiene" + +#: CartView.php:287 +msgid "persons from" +msgstr "personas de" + +#: 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 "Remover" +<<<<<<< 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 "Sí" +<<<<<<< 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" @@ -981,7 +1215,11 @@ msgstr "Seleccione el evento al que desea ingresar personas" msgid "Select Event" msgstr "Seleccionar Evento" +<<<<<<< HEAD #: external/templates/verify/verify-family-info.php:140 +======= +#: external/templates/verify/verify-family-info.php:150 +>>>>>>> master msgid "Verify" msgstr "Verificar" @@ -1022,16 +1260,28 @@ msgstr "Acción" msgid "No Attendees Assigned to Event" msgstr "No hay Participantes Asignados a Evento" +<<<<<<< HEAD #: Checkin.php:480 Include/Functions.php:1658 Reports/CanvassReports.php:245 +======= +#: Checkin.php:472 Include/Functions.php:1658 Reports/CanvassReports.php:245 +>>>>>>> master #: Reports/VotingMembers.php:88 queryparameteroptions_qpo.php:15 msgid "Member" msgstr "Miembro" +<<<<<<< HEAD #: Checkin.php:482 ChurchCRM/Service/PersonService.php:38 msgid " of the" msgstr "de" #: Checkin.php:484 ChurchCRM/Service/PersonService.php:40 PersonView.php:267 +======= +#: Checkin.php:474 ChurchCRM/Service/PersonService.php:38 +msgid " of the" +msgstr "de" + +#: Checkin.php:476 ChurchCRM/Service/PersonService.php:40 PersonView.php:267 +>>>>>>> master msgid "(No assigned family)" msgstr "(No asignado a ninguna familia)" @@ -1115,21 +1365,35 @@ msgstr "Cual es el rol del hijo?" msgid "Information to Include" msgstr "Información a Incluir" +<<<<<<< HEAD #: AutoPaymentEditor.php:690 AutoPaymentEditor.php:695 CartToFamily.php:239 #: CartToFamily.php:244 CartView.php:287 CSVExport.php:105 CSVExport.php:110 +======= +#: 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 "Dirección" #: 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" @@ -1139,7 +1403,11 @@ msgstr "Cumpleaños" msgid "Family Home Phone" msgstr "Teléfono de la Familia" +<<<<<<< HEAD #: ChurchCRM/tasks/FamilyWorkPhoneTask.php:30 DirectoryReports.php:181 +======= +#: DirectoryReports.php:181 +>>>>>>> master msgid "Family Work Phone" msgstr "Teléfono de contacto familia (trabajo)" @@ -1148,7 +1416,11 @@ msgid "Family Cell Phone" msgstr "Teléfono movil (familia)" #: 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 "Email de la Familia" @@ -1350,11 +1622,19 @@ msgstr "Listado de Pagos Electrónicos" msgid "Add a New Electronic Payment Method" msgstr "Agregar un Nuevo Método de Pago Electrónico" +<<<<<<< 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 @@ -1363,7 +1643,11 @@ msgid "Family" msgstr "Familia" #: ElectronicPaymentList.php:199 FamilyCustomFieldsEditor.php:329 +<<<<<<< HEAD #: FamilyCustomFieldsEditor.php:431 FamilyView.php:534 FamilyView.php:639 +======= +#: FamilyCustomFieldsEditor.php:431 FamilyView.php:547 FamilyView.php:655 +>>>>>>> master #: 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 @@ -1371,7 +1655,11 @@ msgstr "Familia" msgid "Type" msgstr "Tipo" +<<<<<<< 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" @@ -1381,7 +1669,11 @@ msgstr "Año fiscal" msgid "Next Date" msgstr "Próxima Fecha" +<<<<<<< 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 "Cantidad" @@ -1390,8 +1682,13 @@ msgstr "Cantidad" msgid "Interval" msgstr "Intervalo" +<<<<<<< HEAD #: AutoPaymentEditor.php:654 ElectronicPaymentList.php:204 FamilyView.php:643 #: FamilyView.php:746 FinancialReports.php:305 SelectDelete.php:215 +======= +#: AutoPaymentEditor.php:868 ElectronicPaymentList.php:204 FamilyView.php:659 +#: FamilyView.php:763 FinancialReports.php:305 SelectDelete.php:215 +>>>>>>> master msgid "Fund" msgstr "Fondo" @@ -1426,8 +1723,13 @@ msgid "Vanco CC" msgstr "Vanco CC" #: 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 @@ -1749,7 +2051,11 @@ msgid "Custom Fields" msgstr "Campos personalizados" #: 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 "Miembros de la Familia" @@ -1770,7 +2076,11 @@ msgstr "Medio" msgid "Last" msgstr "Último" +<<<<<<< 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" @@ -1849,7 +2159,11 @@ msgstr "Diciembre" msgid "Unk" msgstr "UNK" +<<<<<<< HEAD #: FamilyList.php:29 FamilyView.php:312 +======= +#: FamilyList.php:29 FamilyView.php:319 +>>>>>>> master msgid "Family List" msgstr "Lista de Familia" @@ -1858,7 +2172,11 @@ msgid "Add Family" msgstr "Agregar Familia" #: ChurchCRM/model/ChurchCRM/Person.php:103 FamilyEditor.php:436 +<<<<<<< HEAD #: FamilyList.php:48 Menu.php:205 PersonEditor.php:380 +======= +#: FamilyList.php:48 Menu.php:211 PersonEditor.php:380 +>>>>>>> master msgid "Created" msgstr "Creada" @@ -1870,6 +2188,7 @@ msgstr "Editada" msgid "Family View" msgstr "Ver Familia" +<<<<<<< HEAD #: FamilyView.php:226 msgid " of church
    " msgstr " de iglesia
    " @@ -1879,10 +2198,22 @@ msgid "Latitude/Longitude" msgstr "Latitud/Longitud" #: FamilyEditor.php:881 FamilyView.php:249 ManageEnvelopes.php:170 +======= +#: FamilyView.php:230 +msgid " of church
    " +msgstr " de iglesia
    " + +#: FamilyView.php:236 +msgid "Latitude/Longitude" +msgstr "Latitud/Longitud" + +#: FamilyEditor.php:881 FamilyView.php:254 ManageEnvelopes.php:170 +>>>>>>> master #: PledgeEditor.php:528 msgid "Envelope Number" msgstr "Número de sobre" +<<<<<<< HEAD #: FamilyView.php:302 msgid "Verify Info" msgstr "Verificar Información" @@ -1936,10 +2267,66 @@ msgid "No property assignments." msgstr "No hay propiedades asignadas" #: FamilyView.php:536 GroupView.php:356 PersonView.php:655 PrintView.php:451 +======= +#: FamilyView.php:309 +msgid "Verify Info" +msgstr "Verificar Información" + +#: FamilyView.php:311 +msgid "Add New Member" +msgstr "Agregar Nuevo Miembro" + +#: FamilyView.php:315 +msgid "Previous Family" +msgstr "Familia anterior" + +#: FamilyView.php:323 +msgid "Next Family" +msgstr "Familia siguiente" + +#: FamilyView.php:329 +msgid "Delete this Family" +msgstr "Borrar esta Familia" + +#: FamilyView.php:199 PersonView.php:197 +msgid "Upload Photo" +msgstr "Subir foto" + +#: FamilyView.php:204 PersonView.php:201 +msgid "Delete Photo" +msgstr "Borrar foto" + +#: FamilyView.php:338 PersonView.php:353 +msgid "Add a Note" +msgstr "Agregar una Nota" + +#: FamilyView.php:343 +msgid "Add All Family Members to Cart" +msgstr "Agregar Todos los Miembros de la Familia al Separador" + +#: FamilyView.php:447 PersonView.php:379 +msgid "Timeline" +msgstr "Línea de Tiempo" + +#: FamilyView.php:453 +msgid "Automatic Payments" +msgstr "Pagos Automáticos" + +#: FamilyView.php:455 +msgid "Pledges and Payments" +msgstr "Promesas y Pagos" + +#: FamilyView.php:540 PersonView.php:647 PrintView.php:446 +msgid "No property assignments." +msgstr "No hay propiedades asignadas" + +#: FamilyView.php:549 GroupView.php:356 PersonView.php:655 PrintView.php:451 +>>>>>>> master #: PropertyAssign.php:180 SystemSettings.php:152 msgid "Value" msgstr "Valor" +<<<<<<< HEAD #: FamilyView.php:539 FamilyView.php:577 GroupView.php:359 GroupView.php:395 msgid "Edit Value" msgstr "Editar valor" @@ -1949,10 +2336,22 @@ msgid "Assign a New Property" msgstr "Asignar una Nueva Propiedad" #: 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 "Editar valor" + +#: FamilyView.php:613 PersonView.php:688 +msgid "Assign a New Property" +msgstr "Asignar una Nueva Propiedad" + +#: FamilyView.php:634 GroupView.php:433 PersonView.php:724 PersonView.php:810 +>>>>>>> master #: PropertyAssign.php:189 SelectList.php:1081 msgid "Assign" msgstr "Asignar" +<<<<<<< HEAD #: FamilyView.php:640 msgid "Next payment date" msgstr "Próxima fecha de pago" @@ -1995,11 +2394,56 @@ msgstr "Promesa o Pago" #: AutoPaymentEditor.php:632 CanvassEditor.php:198 DepositSlipEditor.php:82 #: EditEventAttendees.php:33 FamilyView.php:748 FindFundRaiser.php:241 +======= +#: FamilyView.php:656 +msgid "Next payment date" +msgstr "Próxima fecha de pago" + +#: FamilyView.php:658 +msgid "Interval (months)" +msgstr "Intervalo (meses)" + +#: FamilyView.php:662 FamilyView.php:773 SelectDelete.php:222 +msgid "Date Updated" +msgstr "Fecha de actualización" + +#: FamilyView.php:663 FamilyView.php:774 SelectDelete.php:223 +msgid "Updated By" +msgstr "Actualizado por" + +#: FamilyView.php:729 +msgid "Add a new automatic payment" +msgstr "Añadir un nuevo pago automático" + +#: FamilyView.php:741 +msgid "Show Pledges" +msgstr "Mostrar Promesas" + +#: FamilyView.php:745 +msgid "Show Payments" +msgstr "mostrar pagos" + +#: FamilyView.php:746 +msgid "Since" +msgstr "Desde" + +#: FamilyView.php:754 MemberRoleChange.php:120 PropertyAssign.php:191 +msgid "Update" +msgstr "Actualizar" + +#: FamilyView.php:762 +msgid "Pledge or Payment" +msgstr "Promesa o Pago" + +#: 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 "Fecha" +<<<<<<< HEAD #: FamilyView.php:750 msgid "NonDeductible" msgstr "no deducible" @@ -2025,6 +2469,33 @@ msgid "Add a new payment" msgstr "Añadir un nuevo pago" #: FamilyView.php:858 +======= +#: FamilyView.php:767 +msgid "NonDeductible" +msgstr "no deducible" + +#: FamilyView.php:768 SelectDelete.php:219 +msgid "Schedule" +msgstr "Agendar" + +#: FamilyView.php:769 SelectDelete.php:220 +msgid "Method" +msgstr "Método" + +#: FamilyView.php:770 PledgeEditor.php:725 SelectDelete.php:221 +msgid "Comment" +msgstr "Comentario" + +#: FamilyView.php:862 +msgid "Add a new pledge" +msgstr "Añadir una nueva promesa" + +#: FamilyView.php:864 +msgid "Add a new payment" +msgstr "Añadir un nuevo pago" + +#: FamilyView.php:875 +>>>>>>> master msgid " Canvass Entry" msgstr " Entrada de Sondeo" @@ -2033,11 +2504,16 @@ msgstr " Entrada de Sondeo" msgid "Close" msgstr "Cerrar" +<<<<<<< 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 "Confirmar Eliminación" +<<<<<<< HEAD #: FamilyView.php:884 PersonView.php:901 msgid "You are about to delete the profile photo, this procedure is irreversible." msgstr "Está a punto de borrar la foto de perfil, este procedimiento es irreversible." @@ -2059,6 +2535,29 @@ msgid "We could not find the family you were looking for.
    Meanwhile, you may" msgstr "No pudimos encontrar la familia que estaba buscando.
    Mientras tanto, podría" #: FamilyView.php:951 PersonView.php:1013 +======= +#: FamilyView.php:901 PersonView.php:901 +msgid "You are about to delete the profile photo, this procedure is irreversible." +msgstr "Está a punto de borrar la foto de perfil, este procedimiento es irreversible." + +#: FamilyView.php:903 PersonView.php:903 +msgid "Do you want to proceed?" +msgstr "Quiere proceder?" + +#: FamilyView.php:930 +msgid "You are about to email copy of the family information in pdf to the following emails" +msgstr "Está a punto de enviar por email una copia de la información familiar en PDF a los siguientes correos" + +#: FamilyView.php:967 +msgid "Oops! Family not found." +msgstr "Oop! Familia no encontrada." + +#: FamilyView.php:970 +msgid "We could not find the family you were looking for.
    Meanwhile, you may" +msgstr "No pudimos encontrar la familia que estaba buscando.
    Mientras tanto, podría" + +#: FamilyView.php:971 PersonView.php:1007 +>>>>>>> master msgid "return to member dashboard" msgstr "volver al dashboard" @@ -2719,7 +3218,11 @@ msgstr "Propiedades Específicas de Grupo" msgid "Disabled for this group." msgstr "Desactivado para este grupo." +<<<<<<< HEAD #: FamilyView.php:438 GroupView.php:342 PersonView.php:382 PrintView.php:435 +======= +#: FamilyView.php:449 GroupView.php:342 PersonView.php:382 PrintView.php:435 +>>>>>>> master msgid "Assigned Properties" msgstr "Propiedades Asignadas" @@ -2815,6 +3318,7 @@ msgstr "Usuario o contraseña no válidos" msgid "Too many failed logins: your account has been locked. Please contact an administrator." msgstr "Demasiado accesos inválidos: su cuenta ha sido bloqueada. Póngase en contacto con el administrador." +<<<<<<< HEAD #: Login.php:162 msgid "Please Login" msgstr "Ingrese" @@ -2828,6 +3332,21 @@ msgid "Password" msgstr "Contraseña" #: Login.php:150 Login.php:207 +======= +#: Login.php:159 +msgid "Please Login" +msgstr "Ingrese" + +#: ChurchCRM/Emails/users/BaseUserEmail.php:30 Login.php:179 +msgid "Email/Username" +msgstr "Email/Usuario" + +#: BackupDatabase.php:76 Login.php:184 UserList.php:56 +msgid "Password" +msgstr "Contraseña" + +#: Login.php:147 Login.php:198 +>>>>>>> master msgid "Login" msgstr "Ingresar" @@ -2843,8 +3362,13 @@ msgstr "Actualizar Registros de Familia" msgid "Update Envelopes" msgstr "Actualizar Sobres" +<<<<<<< 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 "Confirmar" @@ -3024,26 +3548,46 @@ msgid "Latest Families" msgstr "Últimas Familias" #: 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 "Nombre de Familia" +<<<<<<< HEAD #: Menu.php:231 msgid "Updated Families" msgstr "Familias Actualizadas" #: ChurchCRM/model/ChurchCRM/Person.php:108 FamilyEditor.php:471 Menu.php:240 +======= +#: Menu.php:237 +msgid "Updated Families" +msgstr "Familias Actualizadas" + +#: ChurchCRM/model/ChurchCRM/Person.php:108 FamilyEditor.php:471 Menu.php:252 +>>>>>>> master #: PersonEditor.php:384 msgid "Updated" msgstr "Actualizados" +<<<<<<< HEAD #: Menu.php:268 msgid "Latest Members" msgstr "Últimos Miembros" #: Menu.php:303 +======= +#: Menu.php:280 +msgid "Latest Members" +msgstr "Últimos Miembros" + +#: Menu.php:315 +>>>>>>> master msgid "Updated Members" msgstr "Miembros Actualizados" @@ -3329,11 +3873,19 @@ msgstr "Asignar una Nueva Oportunidad de Voluntariado" msgid "Are you sure you want to remove this person from the Group" msgstr "Realmente desea remover a esta persona del Grupo" +<<<<<<< HEAD #: PersonView.php:1010 msgid "Oops! Person not found." msgstr "Oops! Persona no encontrada." #: PersonView.php:1013 +======= +#: PersonView.php:1004 +msgid "Oops! Person not found." +msgstr "Oops! Persona no encontrada." + +#: PersonView.php:1007 +>>>>>>> master msgid "We could not find the person you were looking for.
    Meanwhile, you may" msgstr "No pudimos encontrar a la persona que estaba buscando.
    Mientras tanto, podría" @@ -3461,7 +4013,11 @@ msgstr "Vista imprimible" #: PrintView.php:325 Reports/CanvassReports.php:244 #: sundayschool/SundaySchoolClassView.php:201 +<<<<<<< HEAD #: sundayschool/SundaySchoolDashboard.php:184 +======= +#: sundayschool/SundaySchoolDashboard.php:196 +>>>>>>> master msgid "Age" msgstr "Edad" @@ -3481,7 +4037,7 @@ msgstr "Notas:" msgid "Entered:" msgstr "Ingresado:" -#: ChurchCRM/Service/TimelineService.php:124 PrintView.php:484 +#: ChurchCRM/Service/TimelineService.php:126 PrintView.php:484 msgid "by" msgstr "por" @@ -3587,8 +4143,13 @@ msgid "Add a New Property Type" msgstr "Añadir un nuevo tipo de propiedad" #: 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 "Clase" @@ -3792,7 +4353,11 @@ msgstr "Borrar registros de familia y sus miembros" msgid "Person Listing" msgstr "Listado de personas" +<<<<<<< HEAD #: SelectList.php:184 menuconfig_mcf.php:12 +======= +#: SelectList.php:184 menuconfig_mcf.php:13 +>>>>>>> master msgid "Group Assignment Helper" msgstr "Ayudante de Asignación de Grupos" @@ -3906,7 +4471,11 @@ msgstr "Permiso" msgid "Base URL" msgstr "URL Base" +<<<<<<< HEAD #: ChurchCRM/dto/SystemConfig.php:221 Include/Footer.php:144 +======= +#: ChurchCRM/dto/SystemConfig.php:222 Include/Footer.php:144 +>>>>>>> master #: SystemSettings.php:43 msgid "System Settings" msgstr "Ajustes de Sistema" @@ -3927,11 +4496,19 @@ msgstr "Verificación de dirección" msgid "Update Latitude & Longitude" msgstr "Actualizar Latitud y Longitud" +<<<<<<< HEAD #: UserList.php:118 msgid "User Delete Confirmation" msgstr "confirmación de eliminación de usuario" #: UserList.php:120 +======= +#: UserList.php:121 +msgid "User Delete Confirmation" +msgstr "confirmación de eliminación de usuario" + +#: UserList.php:123 +>>>>>>> master msgid "Please confirm removal of user status from:" msgstr "Confirme la eliminación de estado de usuario de:" @@ -4105,7 +4682,11 @@ msgstr "Nueva Contraseña" msgid "Confirm New Password" msgstr "Confirmar Nueva Contraseña" +<<<<<<< HEAD #: UserList.php:163 +======= +#: UserList.php:166 +>>>>>>> master msgid "Please confirm the password reset of this user" msgstr "Por favor confirme la renovación de contraseña de este usuario" @@ -4450,7 +5031,11 @@ msgstr "Alguna Información general acerca de su sistema será enviada junto a l msgid "No personally identifiable information will be submitted unless you purposefully include it." msgstr "Ninguna información que pueda identificarlo será enviada a menos que la incluya a propósito." +<<<<<<< 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 "Dashboard" @@ -4564,8 +5149,13 @@ msgstr "Relación" msgid "City, State, Zip" msgstr "Ciudad, Estado, Código Postal" +<<<<<<< HEAD #: 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:40 FamilyEditor.php:787 +#: FamilyView.php:241 Reports/ConfirmReportEmail.php:144 +>>>>>>> master #: Reports/ConfirmReport.php:145 msgid "Send Newsletter" msgstr "Enviar Newsletter" @@ -4721,7 +5311,11 @@ msgid "Gift Designation:" msgstr "Designación de Donación:" #: 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 "Escuela Dominical" @@ -4740,7 +5334,11 @@ msgstr "VistaLegada" #: sundayschool/SundaySchoolClassView.php:120 #: sundayschool/SundaySchoolDashboard.php:80 +<<<<<<< HEAD #: sundayschool/SundaySchoolDashboard.php:146 +======= +#: sundayschool/SundaySchoolDashboard.php:152 +>>>>>>> master msgid "Teachers" msgstr "Profesores" @@ -4763,7 +5361,11 @@ msgstr "Cumpleaños por Mes" #: sundayschool/SundaySchoolClassView.php:191 #: sundayschool/SundaySchoolDashboard.php:91 +<<<<<<< HEAD #: sundayschool/SundaySchoolDashboard.php:147 +======= +#: sundayschool/SundaySchoolDashboard.php:153 +>>>>>>> master msgid "Students" msgstr "Estudiantes" @@ -4772,9 +5374,15 @@ msgstr "Estudiantes" msgid "Mobile" msgstr "Teléfono Móvil" +<<<<<<< HEAD #: external/templates/verify/verify-family-info.php:25 #: sundayschool/SundaySchoolClassView.php:205 #: sundayschool/SundaySchoolDashboard.php:185 +======= +#: external/templates/verify/verify-family-info.php:26 +#: sundayschool/SundaySchoolClassView.php:205 +#: sundayschool/SundaySchoolDashboard.php:197 +>>>>>>> master msgid "Home Address" msgstr "Dirección de Hogar" @@ -4850,7 +5458,11 @@ msgstr "Lista de asistentes" msgid "Export All Classes, Kids, and Parent to CSV file" msgstr "Exportar Todas las Clases, Niños y Padres a un archivo CSV" +<<<<<<< HEAD #: sundayschool/SundaySchoolDashboard.php:173 +======= +#: sundayschool/SundaySchoolDashboard.php:179 +>>>>>>> master msgid "Students not in a Sunday School Class" msgstr "Estudiantes en ninguna Escuela Dominical" @@ -4941,7 +5553,11 @@ msgstr "Ver Todas las Familias" msgid "Events" msgstr "Eventos" +<<<<<<< HEAD #: FundRaiserEditor.php:35 menuconfig_mcf.php:25 +======= +#: FundRaiserEditor.php:35 menuconfig_mcf.php:26 +>>>>>>> master msgid "Fundraiser" msgstr "Recaudación de Fondos" @@ -5093,6 +5709,7 @@ msgstr "Ingresar a Base de Datos restaurada" msgid "Restore Error." msgstr "Error de Restauración" +<<<<<<< HEAD #: ChurchCRM/dto/SystemConfig.php:214 msgid "Church Information" msgstr "Información de Iglesia" @@ -5118,6 +5735,33 @@ msgid "Report Settings" msgstr "Ajustes de Reporte" #: ChurchCRM/dto/SystemConfig.php:223 +======= +#: ChurchCRM/dto/SystemConfig.php:215 +msgid "Church Information" +msgstr "Información de Iglesia" + +#: ChurchCRM/dto/SystemConfig.php:216 +msgid "User setup" +msgstr "Configuración de Usuario" + +#: ChurchCRM/dto/SystemConfig.php:217 +msgid "Email Setup" +msgstr "Ajustes de Email" + +#: ChurchCRM/dto/SystemConfig.php:218 +msgid "Member Setup" +msgstr "Configuración de Miembro" + +#: ChurchCRM/dto/SystemConfig.php:219 +msgid "Map Settings" +msgstr "Ajustes de Mapa" + +#: ChurchCRM/dto/SystemConfig.php:220 +msgid "Report Settings" +msgstr "Ajustes de Reporte" + +#: ChurchCRM/dto/SystemConfig.php:224 +>>>>>>> master msgid "Localization" msgstr "Localización" @@ -5255,12 +5899,21 @@ msgstr "Agregar Nueva Clase" msgid "Export to CSV" msgstr "Exportar a CSV" +<<<<<<< HEAD #: sundayschool/SundaySchoolDashboard.php:226 #: sundayschool/SundaySchoolDashboard.php:239 msgid "Add" msgstr "Agregar" #: sundayschool/SundaySchoolDashboard.php:231 +======= +#: sundayschool/SundaySchoolDashboard.php:238 +#: sundayschool/SundaySchoolDashboard.php:251 +msgid "Add" +msgstr "Agregar" + +#: sundayschool/SundaySchoolDashboard.php:243 +>>>>>>> master msgid "Enter Name" msgstr "Ingresar Nombre" @@ -5405,11 +6058,19 @@ msgstr "Limpiar Todos los Fondos" msgid "Deposit Comment" msgstr "Comentario de Depósito" +<<<<<<< HEAD #: Login.php:167 msgid "Your previous session timed out. Please login again." msgstr "Su sesión previa ha expirado. Por favor ingrese nuevamente." #: Login.php:214 +======= +#: Login.php:164 +msgid "Your previous session timed out. Please login again." +msgstr "Su sesión previa ha expirado. Por favor ingrese nuevamente." + +#: Login.php:206 +>>>>>>> master msgid "Register a new Family" msgstr "Registrar una nueva Familia" @@ -5540,7 +6201,11 @@ msgstr "Escrutador:" msgid "Add Attendees for Event" msgstr "Agregar Asistentes para Evento" +<<<<<<< HEAD #: Checkin.php:482 ChurchCRM/Service/PersonService.php:38 +======= +#: Checkin.php:474 ChurchCRM/Service/PersonService.php:38 +>>>>>>> master msgid "family" msgstr "familia" @@ -5648,7 +6313,11 @@ msgstr "Todo " msgid "Family Map" msgstr "Mapa de Familias" +<<<<<<< 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 "Grupos" @@ -7753,10 +8422,6 @@ msgstr "Nombre de Iglesia está definido con valor por defecto" msgid "SMTP Server info are blank" msgstr "El campo de Servidor de SMTP, se encuentra en blanco." -#: ChurchCRM/tasks/FamilyWorkPhoneTask.php:35 -msgid "In Church CRM 2.6.0 we will no longer support a work phone for a family" -msgstr "En Church CRM 2.6.0 no seguiremos soportando un teléfono de trabajo para una familia" - #: ChurchCRM/tasks/HttpsTask.php:21 msgid "Your system could be more secure by installing an TLS/SSL Cert." msgstr "Su sistema podría ser más seguro instalando un Certificado TLS/SSL." @@ -7822,22 +8487,23 @@ msgstr "Por favor ingrese lo siguiente para comenzar la verificación de su fami msgid "email" msgstr "Correo Electronico" -#: external/templates/verify/verify-family-info.php:7 +#: external/templates/verify/verify-family-info.php:8 msgid "Family Verification" msgstr "Verificación de Familia" -#: external/templates/verify/verify-family-info.php:47 +#: external/templates/verify/verify-family-info.php:51 msgid "Family Member(s)" msgstr "Miembro(s) de Familia" -#: external/templates/verify/verify-family-info.php:74 +#: external/templates/verify/verify-family-info.php:83 msgid "Work Email" msgstr "Correo electrónico del trabajo" -#: external/templates/verify/verify-family-info.php:77 +#: external/templates/verify/verify-family-info.php:87 msgid "Age Hidden" msgstr "Ocultar Edad" +<<<<<<< HEAD #: external/templates/verify/verify-family-info.php:126 msgid "Please let us know what information to update if any" msgstr "Por favor háganos saber qué información actualizar, si alguna" @@ -7871,6 +8537,41 @@ msgid "PDF Report" msgstr "Reporte en PDF" #: FamilyView.php:935 +======= +#: external/templates/verify/verify-family-info.php:136 +msgid "Please let us know what information to update if any" +msgstr "Por favor háganos saber qué información actualizar, si alguna" + +#: external/templates/verify/verify-family-info.php:141 +msgid "Your verification request is complete" +msgstr "Su petición de verificación está completada" + +#: external/templates/verify/verify-family-info.php:145 +msgid "We encountered an error submitting with your verification data" +msgstr "Encontramos un error al enviar sus datos de verificación" + +#: external/templates/verify/verify-family-info.php:151 +msgid "Visit our Site" +msgstr "Visite nuestro sitio" + +#: FamilyView.php:923 +msgid "Request Family Info Verification" +msgstr "Petición de Verificación de Información Familiar" + +#: FamilyView.php:926 +msgid "Select how do you want to request the family information to be verified" +msgstr "Seleccione cómo quiere verificar la petición de información familiar" + +#: FamilyView.php:947 +msgid "Online Verification" +msgstr "Verificación Online" + +#: FamilyView.php:952 +msgid "PDF Report" +msgstr "Reporte en PDF" + +#: FamilyView.php:954 +>>>>>>> master msgid "Verified In Person" msgstr "Verificar en Persona" @@ -8067,7 +8768,11 @@ msgstr "Familia Desactivada" msgid "Activated the Family" msgstr "Familia Activada" +<<<<<<< HEAD #: CartView.php:280 Include/Functions.php:121 +======= +#: CartView.php:287 Include/Functions.php:121 +>>>>>>> master msgid "families" msgstr "familias" @@ -8075,6 +8780,7 @@ msgstr "familias" msgid "Deposit ticket type. QBDT - Quickbooks" msgstr "Tipo de ticket de depósito. QBDT - Quickbooks" +<<<<<<< HEAD #: ChurchCRM/dto/SystemConfig.php:220 msgid "Financial Settings" msgstr "Ajustes Financieros" @@ -8085,6 +8791,18 @@ msgid "An invalid configuration name has been requested" msgstr "Un nombre ajuste inválido ha sido solicitado." #: ChurchCRM/dto/SystemConfig.php:317 +======= +#: ChurchCRM/dto/SystemConfig.php:221 +msgid "Financial Settings" +msgstr "Ajustes Financieros" + +#: ChurchCRM/dto/SystemConfig.php:275 ChurchCRM/dto/SystemConfig.php:287 +#: ChurchCRM/dto/SystemConfig.php:300 +msgid "An invalid configuration name has been requested" +msgstr "Un nombre ajuste inválido ha sido solicitado." + +#: ChurchCRM/dto/SystemConfig.php:318 +>>>>>>> master msgid "An invalid configuration id has been requested" msgstr "Un id de configuración ha sido solicitado." @@ -8105,6 +8823,7 @@ msgstr "Por favor asegúrese de que esto es lo que quiere hacer.

    " msgid " This Family is Deactivated" msgstr " Esta Familia está Desactivada" +<<<<<<< HEAD #: FamilyView.php:343 msgid " this Family" msgstr " esta Familia" @@ -8122,6 +8841,25 @@ msgid "Please confirm deactivation of family" msgstr "Por favor confirme desactivación de familia" #: FamilyView.php:972 +======= +#: FamilyView.php:349 +msgid " this Family" +msgstr " esta Familia" + +#: FamilyView.php:988 +msgid "Confirm Deactivation" +msgstr "Confirme Desactivación" + +#: FamilyView.php:988 +msgid "Confirm Activation" +msgstr "Confirme Activación" + +#: FamilyView.php:990 +msgid "Please confirm deactivation of family" +msgstr "Por favor confirme desactivación de familia" + +#: FamilyView.php:993 +>>>>>>> master msgid "Please confirm activation of family" msgstr "Por favor confirme desactivación de familia" @@ -8153,7 +8891,11 @@ msgstr "Quitar De Separador" msgid "Family Member" msgstr "Miembro de Familia" +<<<<<<< HEAD #: FamilyView.php:606 PersonView.php:696 QueryView.php:322 +======= +#: FamilyView.php:619 PersonView.php:696 QueryView.php:322 +>>>>>>> master msgid "select an option" msgstr "seleccione una opción" @@ -8279,11 +9021,19 @@ msgstr "Cuenta Desbloqueada" msgid "Part" msgstr "Parte" +<<<<<<< HEAD #: FamilyView.php:193 PersonView.php:194 msgid "View Photo" msgstr "Ver Foto" #: FamilyView.php:1026 +======= +#: FamilyView.php:195 PersonView.php:194 +msgid "View Photo" +msgstr "Ver Foto" + +#: FamilyView.php:1046 +>>>>>>> master msgid "Family Photo" msgstr "Foto de Familia" @@ -8331,7 +9081,11 @@ msgstr "Leyenda" msgid "assigned" msgstr "asignado" +<<<<<<< HEAD #: PersonView.php:990 +======= +#: PersonView.php:984 +>>>>>>> master msgid "Photo" msgstr "Foto" @@ -8351,6 +9105,7 @@ msgstr "Mostrando estudiantes con cumpleaños en" msgid "Actions" msgstr "Acciones" +<<<<<<< HEAD #: UserList.php:140 UserList.php:161 msgid "Action Confirmation" msgstr "Confirmación de Acción" @@ -8363,6 +9118,28 @@ msgstr "Por favor confirme restablecer la cuenta de ingresos fallidos" msgid "Password reset for" msgstr "Restablecer contraseña para" +======= +#: UserList.php:143 UserList.php:164 +msgid "Action Confirmation" +msgstr "Confirmación de Acción" + +#: UserList.php:145 +msgid "Please confirm reset failed login count" +msgstr "Por favor confirme restablecer la cuenta de ingresos fallidos" + +#: UserList.php:176 +msgid "Password reset for" +msgstr "Restablecer contraseña para" + +#: menuconfig_mcf.php:9 +msgid "View Active Families" +msgstr "Ver Familias Activas" + +#: menuconfig_mcf.php:10 +msgid "View Inactive Families" +msgstr "Ver Familias Inactivas" + +>>>>>>> master #: ChurchCRM/dto/SystemConfig.php:101 msgid "SMTP Server timeout in sec" msgstr "Tiempo de espera del Servidor SMTP en segundos" @@ -8488,6 +9265,37 @@ msgstr "ALERTA" msgid "EMERGENCY" msgstr "EMERGENCIA" +<<<<<<< HEAD +======= +#: ChurchCRM/dto/SystemConfig.php:69 +msgid "Title FirstName MiddleName LastName" +msgstr "Título PrimerNombre SegundoNombre Apellido" + +#: ChurchCRM/dto/SystemConfig.php:70 +msgid "Title FirstName MiddleInitial. LastName" +msgstr "Título Nombre InicialSegundoNombre Apellido" + +#: ChurchCRM/dto/SystemConfig.php:71 +msgid "LastName, Title FirstName MiddleName" +msgstr "Apellido, Título PrimerNombre SegundoNombre" + +#: ChurchCRM/dto/SystemConfig.php:72 +msgid "LastName, Title FirstName MiddleInitial" +msgstr "Apellido, Título PrimerNombre InicialSegundoNombre" + +#: ChurchCRM/dto/SystemConfig.php:73 +msgid "FirstName MiddleName LastName" +msgstr "PrimerNombre SegundoNombre Apellido" + +#: ChurchCRM/dto/SystemConfig.php:74 +msgid "Title FirstName LastName" +msgstr "Título PrimerNombre Apellido" + +#: ChurchCRM/dto/SystemConfig.php:75 +msgid "LastName, Title FirstName" +msgstr "Apellido, Titulo PrimerNombre" + +>>>>>>> master #: ChurchCRM/dto/SystemConfig.php:84 msgid "Event Log severity to write, used by ORM and App Logs" msgstr "Log de eventos de gravedad a escribir, usado por ORM y Logs de App" @@ -8528,11 +9336,19 @@ msgstr "Marca de Tiempo de Visibilidad de Quiosco" msgid "Show/Hide Lost Password Link on the login screen" msgstr "Mostrar/Ocultar Enlace de Contraseña Perdida en la pantalla de ingreso" +<<<<<<< HEAD #: ChurchCRM/dto/SystemConfig.php:222 msgid "Backup" msgstr "Respaldo" #: ChurchCRM/dto/SystemConfig.php:224 +======= +#: ChurchCRM/dto/SystemConfig.php:223 +msgid "Backup" +msgstr "Respaldo" + +#: ChurchCRM/dto/SystemConfig.php:225 +>>>>>>> master msgid "Integration" msgstr "Integración" @@ -8632,7 +9448,11 @@ msgstr "Activar Nuevo Registro de Quiosco" msgid "Active Kiosks" msgstr "Activar Quioscos" +<<<<<<< HEAD #: Login.php:192 +======= +#: Login.php:190 +>>>>>>> master msgid "I forgot my password" msgstr "Olvidé mi contraseña" @@ -8640,3 +9460,50 @@ msgstr "Olvidé mi contraseña" msgid "Attendees Checked In" msgstr "Asistentes Registrados En" +<<<<<<< HEAD +======= +#: AutoPaymentEditor.php:133 +msgid " family" +msgstr " familia" + +#: AutoPaymentEditor.php:832 +msgid "Bank Draft " +msgstr "Giro Bancario " + +#: AutoPaymentEditor.php:836 +msgid "Credit Card " +msgstr "Tarjeta de Crédito " + +#: AutoPaymentEditor.php:840 +msgid "Disable " +msgstr "Desabilitar " + +#: AutoPaymentEditor.php:1018 +msgid "Store Private Data at Vanco" +msgstr "Almacenar Datos Privados en Vanco" + +#: CartView.php:106 +msgid "Cart Functions" +msgstr "Funciones del Separador" + +#: CartView.php:195 +msgid "Text Cart" +msgstr "Separador de Texto" + +#: ChurchCRM/dto/SystemConfig.php:208 +msgid "Your Church's Website" +msgstr "Sitio Web de su Iglesia" + +#: ChurchCRM/Service/TimelineService.php:118 +msgid "Self Verification" +msgstr "Autoverificación" + +#: FamilyView.php:349 +msgid "Deactivate" +msgstr "Desactivar" + +#: FamilyView.php:349 +msgid "Activate" +msgstr "Activar" + +>>>>>>> master diff --git a/src/locale/fr_FR/LC_MESSAGES/messages.po b/src/locale/fr_FR/LC_MESSAGES/messages.po index e4d1184654..22a6a4f36e 100644 --- a/src/locale/fr_FR/LC_MESSAGES/messages.po +++ b/src/locale/fr_FR/LC_MESSAGES/messages.po @@ -14,15 +14,20 @@ msgstr "Impossible d'exécuter la requête." #: AutoPaymentDelete.php:23 msgid "Confirm Delete Automatic payment" -msgstr "Confirmer suppression paiement automatique" +msgstr "Confirmer suppression automatique de paiement" #: AutoPaymentDelete.php:67 Checkin.php:293 Checkin.php:376 #: DepositSlipEditor.php:232 DonationFundEditor.php:156 #: DonationFundEditor.php:186 EditEventAttendees.php:76 #: ElectronicPaymentList.php:222 ElectronicPaymentList.php:288 #: EventNames.php:305 FamilyCustomFieldsEditor.php:334 +<<<<<<< HEAD #: FamilyCustomFieldsEditor.php:392 FamilyView.php:645 FamilyView.php:697 #: FamilyView.php:755 FamilyView.php:892 FindDepositSlip.php:108 +======= +#: FamilyCustomFieldsEditor.php:392 FamilyView.php:661 FamilyView.php:713 +#: FamilyView.php:772 FamilyView.php:909 FindDepositSlip.php:108 +>>>>>>> master #: FundRaiserEditor.php:204 ListEvents.php:250 PaddleNumList.php:60 #: PersonCustomFieldsEditor.php:318 PersonCustomFieldsEditor.php:387 #: PersonView.php:908 PledgeDelete.php:57 PropertyList.php:69 @@ -31,11 +36,19 @@ msgstr "Confirmer suppression paiement automatique" msgid "Delete" msgstr "Supprimer" +<<<<<<< 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 @@ -43,17 +56,29 @@ msgstr "Supprimer" #: 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 "Annuler" +<<<<<<< HEAD #: AutoPaymentEditor.php:131 msgid "Automatic payment configuration for the " msgstr "Configuration automatique du paiement pour le" #: AutoPaymentEditor.php:582 CanvassEditor.php:242 DepositSlipEditor.php:98 +======= +#: AutoPaymentEditor.php:133 +msgid "Automatic payment configuration for the " +msgstr "Configuration automatique du paiement pour le" + +#: 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 @@ -66,7 +91,11 @@ msgstr "Configuration automatique du paiement pour le" msgid "Save" msgstr "Enregistrer" +<<<<<<< HEAD #: AutoPaymentEditor.php:599 BatchWinnerEntry.php:87 BatchWinnerEntry.php:99 +======= +#: AutoPaymentEditor.php:808 BatchWinnerEntry.php:87 BatchWinnerEntry.php:99 +>>>>>>> master #: 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 @@ -78,11 +107,16 @@ msgstr "Enregistrer" msgid "Unassigned" msgstr "Non assigné" +<<<<<<< HEAD #: AutoPaymentEditor.php:619 +======= +#: AutoPaymentEditor.php:828 +>>>>>>> master #, fuzzy msgid "Automatic payment type" msgstr "Type de paiement automatique" +<<<<<<< HEAD #: AutoPaymentEditor.php:644 msgid "Payment amount" msgstr "Montant du paiement" @@ -92,37 +126,68 @@ msgid "Payment interval (months)" msgstr "Intervalle de paiement (mois)" #: AutoPaymentEditor.php:657 CartToGroup.php:80 EditEventTypes.php:91 +======= +#: AutoPaymentEditor.php:858 +msgid "Payment amount" +msgstr "Montant du paiement" + +#: AutoPaymentEditor.php:863 +msgid "Payment interval (months)" +msgstr "Intervalle de paiement (mois)" + +#: 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 "Aucun" +<<<<<<< HEAD #: AutoPaymentEditor.php:670 msgid "inactive" msgstr "inactif" #: AutoPaymentEditor.php:700 CartToFamily.php:249 CSVExport.php:115 +======= +#: AutoPaymentEditor.php:884 +msgid "inactive" +msgstr "inactif" + +#: 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 "Ville" +<<<<<<< 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 "État/Région" +<<<<<<< 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 #, fuzzy msgid "Country" msgstr "Pays" +<<<<<<< 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 @@ -130,60 +195,105 @@ msgstr "Pays" msgid "Phone" msgstr "Fixe" +<<<<<<< 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 "Email" +<<<<<<< HEAD #: AutoPaymentEditor.php:730 ElectronicPaymentList.php:213 +======= +#: AutoPaymentEditor.php:952 ElectronicPaymentList.php:213 +>>>>>>> master #: FinancialReports.php:267 FindDepositSlip.php:52 PledgeEditor.php:592 #, fuzzy msgid "Credit Card" msgstr "Carte de crédit" +<<<<<<< HEAD #: AutoPaymentEditor.php:737 +======= +#: AutoPaymentEditor.php:960 +>>>>>>> master #, fuzzy msgid "Vanco Credit Card Method" msgstr "Méthode Vanco des cartes de crédit" +<<<<<<< HEAD #: AutoPaymentEditor.php:745 msgid "Expiration Month" msgstr "Mois d'expiration" #: AutoPaymentEditor.php:750 +======= +#: AutoPaymentEditor.php:969 +msgid "Expiration Month" +msgstr "Mois d'expiration" + +#: AutoPaymentEditor.php:975 +>>>>>>> master #, fuzzy msgid "Expiration Year" msgstr "Année d'expiration" +<<<<<<< HEAD #: AutoPaymentEditor.php:755 +======= +#: AutoPaymentEditor.php:981 +>>>>>>> master #, fuzzy msgid "Bank Name" msgstr "Nom de la banque" +<<<<<<< HEAD #: AutoPaymentEditor.php:760 +======= +#: AutoPaymentEditor.php:987 +>>>>>>> master #, fuzzy msgid "Bank Route Number" msgstr "Numéro et code de la banque" +<<<<<<< HEAD #: AutoPaymentEditor.php:765 msgid "Bank Account Number" msgstr "Numéro de compte bancaire" #: AutoPaymentEditor.php:772 +======= +#: AutoPaymentEditor.php:993 +msgid "Bank Account Number" +msgstr "Numéro de compte bancaire" + +#: AutoPaymentEditor.php:1001 +>>>>>>> master msgid "Vanco Bank Account Method" msgstr "Méthode Vanco des comptes bancaires" @@ -198,11 +308,11 @@ msgstr "Cet outil vous aidera à effectuer une sauvegarde manuelle de la base de #: BackupDatabase.php:55 msgid "You should make a manual backup at least once a week unless you already have a regular backup procedule for your systems." -msgstr "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." +msgstr "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." #: BackupDatabase.php:56 msgid "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." -msgstr "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." +msgstr "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." #: BackupDatabase.php:57 msgid "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" @@ -210,12 +320,12 @@ msgstr "Si vous êtes concernés par la confidentialité des données enregistr #: BackupDatabase.php:58 msgid "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." -msgstr "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." +msgstr "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." #: BackupDatabase.php:62 #, fuzzy msgid "Select archive type" -msgstr "Sélectionnez le type de sauvegarde" +msgstr "Sélectionnez le type de sauvegarde" #: BackupDatabase.php:64 msgid "GZip" @@ -223,7 +333,7 @@ msgstr "Gzip" #: BackupDatabase.php:69 msgid "Uncompressed" -msgstr "Non compressé" +msgstr "Non compressé" #: BackupDatabase.php:70 #, fuzzy @@ -241,7 +351,7 @@ msgstr "Retapez votre Mot de Passe" #: BackupDatabase.php:81 msgid "Generate and Download Backup" -msgstr "Générez ou Téléchargez Sauvegardes" +msgstr "Générez ou Téléchargez Sauvegarde" #: BackupDatabase.php:82 msgid "Generate and Ship Backup to External Storage" @@ -276,10 +386,17 @@ msgstr "Export au format CSV" msgid "Field Selection" msgstr "Sélection de champs" +<<<<<<< HEAD #: AutoPaymentEditor.php:685 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:182 +======= +#: 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 +>>>>>>> master #, fuzzy msgid "Last Name" msgstr "Nom" @@ -288,21 +405,32 @@ msgstr "Nom" msgid "Required" msgstr "Requis" +<<<<<<< HEAD #: AutoPaymentEditor.php:680 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:181 +======= +#: 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 +>>>>>>> master #, fuzzy msgid "First Name" -msgstr "Prénom" +msgstr "Prénom" #: CSVExport.php:95 CSVImport.php:216 PersonEditor.php:619 #, fuzzy msgid "Middle Name" -msgstr "Deuxième Prénom" +msgstr "Deuxième Prénom" #. Code is masculine - no "e" for "postal" +<<<<<<< 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 @@ -327,7 +455,7 @@ msgstr "Email Travail / Autre" #: PrintView.php:289 #, fuzzy msgid "Membership Date" -msgstr "Date d'Adhésion" +msgstr "Date d'Adhésion" #: CSVExport.php:170 #, fuzzy @@ -337,18 +465,22 @@ msgstr "Date De Naissance / Anniversaire" #: CSVExport.php:175 #, fuzzy msgid "Age / Years Married" -msgstr "Durée / Années de Mariage" +msgstr "Durée / Années de Mariage" +<<<<<<< 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 #, fuzzy msgid "Family Role" -msgstr "Rôle Famille" +msgstr "Rôle Famille" #: CSVExport.php:183 #, fuzzy msgid "Depends whether using person or family output method" -msgstr "Dépend de la méthode de sortie choisie par l'utilisateur" +msgstr "Dépend de la méthode de sortie choisie par l'utilisateur" #: CSVExport.php:196 msgid "Custom Field Selection" @@ -360,7 +492,7 @@ msgstr "Champs personnalisés des Membres" #: CSVExport.php:222 msgid "Custom Family Fields" -msgstr "Champs Personnalisés familiaux" +msgstr "Champs Personnalisés familiaux" #: CSVExport.php:249 FinancialReports.php:111 msgid "Filters" @@ -369,21 +501,21 @@ msgstr "Filtres" #: CSVExport.php:255 #, fuzzy msgid "Records to export" -msgstr "Enregistrements à exporter" +msgstr "Enregistrements à exporter" #: CSVExport.php:264 msgid "Based on filters below.." -msgstr "Basé sur des filtres ci-dessous.." +msgstr "Basé sur des filtres ci-dessous.." #: CSVExport.php:267 msgid "People in Cart (filters ignored)" -msgstr "Personnes dans le Panier (filtres ignorés)" +msgstr "Personnes dans le Panier (filtres ignorés)" #: CSVExport.php:293 CSVExport.php:318 CSVExport.php:354 #: DirectoryReports.php:84 DirectoryReports.php:102 DirectoryReports.php:120 #: DirectoryReports.php:138 DirectoryReports.php:157 FinancialReports.php:262 msgid "Use Ctrl Key to select multiple" -msgstr "Utilisez la touche Ctrl pour une sélection multiple" +msgstr "Utilisez la touche Ctrl pour une sélection multiple" #: CSVExport.php:335 msgid "Don't Filter" @@ -408,7 +540,7 @@ msgstr "Femme" #: CSVExport.php:346 DirectoryReports.php:100 #, fuzzy msgid "Group Membership" -msgstr "Adhésion au Groupe" +msgstr "Adhésion au Groupe" #: CSVExport.php:378 CSVExport.php:395 CSVExport.php:412 CSVExport.php:429 msgid "From:" @@ -430,7 +562,7 @@ msgstr "Date d'Anniversaire" #: CSVExport.php:442 FinancialReports.php:326 msgid "Output Method:" -msgstr "Méthode d'Exportation:" +msgstr "Méthode d'Exportation:" #: CSVExport.php:446 msgid "CSV Individual Records" @@ -438,7 +570,7 @@ msgstr "Enregistrements individuels CSV" #: CSVExport.php:447 msgid "CSV Combine Families" -msgstr "Données Familles en CVS" +msgstr "Données Familles en CVS" #: CSVExport.php:448 msgid "Add Individuals to Cart" @@ -446,16 +578,16 @@ msgstr "Ajoutez des individus au panier" #: CSVExport.php:451 msgid "Skip records with incomplete mail address" -msgstr "Ignorer les enregistrements qui ont une adresse email incomplète " +msgstr "Ignorer les enregistrements qui ont une adresse email incomplète " #: CSVExport.php:453 msgid "Create File" -msgstr "Dossier créé" +msgstr "Fichier créé" #: CSVImport.php:131 #, fuzzy msgid "No file selected for upload." -msgstr "Aucune photo n'a été sélectionné pour le téléchargement." +msgstr "Aucune photo n'a été sélectionné pour le téléchargement." #: CSVImport.php:158 msgid "Total number of rows in the CSV file:" @@ -476,7 +608,7 @@ msgstr "Titre" #: PersonEditor.php:641 #, fuzzy msgid "Suffix" -msgstr "Suffixe:" +msgstr "Suffixe" #: CSVExport.php:326 CSVImport.php:219 FamilyEditor.php:949 #: PersonEditor.php:586 PrintView.php:223 PrintView.php:323 @@ -494,9 +626,15 @@ msgstr "Enveloppe De Cotisation:" #: 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 @@ -506,8 +644,13 @@ msgid "Home Phone" msgstr "Téléphone Fixe" #: 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 @@ -515,8 +658,13 @@ msgid "Work Phone" msgstr "Téléphone Professionnel" #: 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" @@ -529,13 +677,22 @@ msgstr "Travail / Autres Email:" #: 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 "Date de naissance" #: 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 "Date de Mariage:" @@ -568,7 +725,11 @@ msgstr "REMARQUE: Les séparateurs (tirets, etc) et leurs manque pas d'impor msgid "Default country if none specified otherwise" msgstr "Pays par défaut si aucune indication contraire" +<<<<<<< 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" @@ -788,7 +949,7 @@ msgstr "Ajouter l'événement au Panier" #: CartToEvent.php:61 #, fuzzy msgid "Select the event to which you would like to add your cart" -msgstr "Sésectionnez l'événement que vous voulez ajouter au panier" +msgstr "Sélectionner l'événement à ajouter au panier" #: CartToEvent.php:88 CartToGroup.php:100 msgid "OR" @@ -812,11 +973,19 @@ msgstr "Pas de nom de famille saisi!" msgid "Add Cart to Family" msgstr "Ajouter une Famille au panier" +<<<<<<< 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 #: EventNames.php:266 FamilyCustomFieldsEditor.php:330 #: FamilyCustomFieldsEditor.php:444 FamilyList.php:43 FamilyView.php:535 +======= +#: 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:330 +#: FamilyCustomFieldsEditor.php:444 FamilyList.php:43 FamilyView.php:548 +>>>>>>> master #: GeoPage.php:385 GroupEditor.php:77 GroupPropsFormEditor.php:284 #: GroupPropsFormEditor.php:396 GroupView.php:321 GroupView.php:355 #: PersonCustomFieldsEditor.php:314 PersonCustomFieldsEditor.php:445 @@ -882,7 +1051,7 @@ msgstr "Ajouter le Panier au Groupe" #: CartToGroup.php:72 #, fuzzy msgid "Select the group to which you would like to add your cart" -msgstr "Sélectionnez le groupe que vous voulez ajouter au panier" +msgstr "Sélectionner le groupe que vous voulez ajouter au panier" #: CartToGroup.php:76 GroupReports.php:48 PersonToGroup.php:66 #: sundayschool/SundaySchoolReports.php:143 @@ -900,22 +1069,30 @@ msgstr "Ajoutez au groupe" #: CartToGroup.php:101 msgid "Create a New Group" -msgstr "Créez un nouveau groupe" +msgstr "Créer un nouveau groupe" -#: CartView.php:42 +#: CartView.php:41 msgid "View Your Cart" msgstr "Voir votre panier" -#: CartView.php:50 +#: CartView.php:49 msgid "You have no items in your cart." msgstr "Vous n'avez aucun item dans votre panier." +<<<<<<< HEAD #: CartView.php:59 +======= +#: CartView.php:58 +>>>>>>> master #, fuzzy msgid "Back to Menu" msgstr "Revenir au menu" +<<<<<<< HEAD #: CartView.php:94 +======= +#: CartView.php:93 +>>>>>>> master msgid "Go To Labels" msgstr "Aller à étiquettes" @@ -923,16 +1100,28 @@ msgstr "Aller à étiquettes" msgid "Empty Cart" msgstr "Vider le Panier" +<<<<<<< HEAD #: CartView.php:113 Include/Header.php:131 msgid "Empty Cart to Group" msgstr "Vider le Panier Groupe" #: CartView.php:118 Include/Header.php:136 +======= +#: CartView.php:114 Include/Header.php:131 +msgid "Empty Cart to Group" +msgstr "Vider le Panier Groupe" + +#: CartView.php:120 Include/Header.php:136 +>>>>>>> master #, fuzzy msgid "Empty Cart to Family" msgstr "Vider le Panier Famille" +<<<<<<< HEAD #: CartView.php:121 Include/Header.php:141 +======= +#: CartView.php:124 Include/Header.php:141 +>>>>>>> master #, fuzzy msgid "Empty Cart to Event" msgstr "Vider le Panier Evénement" @@ -942,7 +1131,11 @@ msgstr "Vider le Panier Evénement" msgid "Map Cart" msgstr "Panier carte" +<<<<<<< HEAD #: CartView.php:129 +======= +#: CartView.php:135 +>>>>>>> master #, fuzzy msgid "Name Tags" msgstr "Nom étiquettes" @@ -952,16 +1145,25 @@ msgstr "Nom étiquettes" msgid "Email Cart" msgstr "Email le panier" +<<<<<<< HEAD #: CartView.php:164 GroupView.php:205 +======= +#: CartView.php:170 GroupView.php:205 +>>>>>>> master #: sundayschool/SundaySchoolClassView.php:100 msgid "Email (BCC)" msgstr "Mail (BCC)" +<<<<<<< HEAD #: CartView.php:193 +======= +#: CartView.php:200 +>>>>>>> master #, fuzzy msgid "Create Directory From Cart" -msgstr "Créer un annuaire depuis le panier" +msgstr "Créer un annuaire depuis le panier" +<<<<<<< HEAD #: CartView.php:220 CartView.php:261 msgid "Generate Labels" msgstr "Générer des Etiquettes" @@ -971,33 +1173,65 @@ msgid "Bulk Mail Presort" msgstr "Courrier en vrac pré-trié" #: CartView.php:237 +======= +#: CartView.php:224 CartView.php:266 +msgid "Generate Labels" +msgstr "Générer des Etiquettes" + +#: CartView.php:232 +msgid "Bulk Mail Presort" +msgstr "Courrier en vrac pré-trié" + +#: CartView.php:241 +>>>>>>> master #, fuzzy msgid "Quiet Presort" msgstr "pré-Trier tranquillement" +<<<<<<< HEAD #: CartView.php:280 +======= +#: CartView.php:287 +>>>>>>> master #, fuzzy msgid "Your cart contains" msgstr "Votre panier contient" +<<<<<<< HEAD #: CartView.php:280 +======= +#: CartView.php:287 +>>>>>>> master #, fuzzy msgid "persons from" msgstr "Personnes de" +<<<<<<< HEAD #: 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: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 "Supprimer" +<<<<<<< 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 "Oui" +<<<<<<< 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" @@ -1054,7 +1288,11 @@ msgstr "Sélectionner l'événement auquel vous voudriez enregistrer les personn msgid "Select Event" msgstr "Sélectionner l'événement" +<<<<<<< HEAD #: external/templates/verify/verify-family-info.php:140 +======= +#: external/templates/verify/verify-family-info.php:150 +>>>>>>> master msgid "Verify" msgstr "Vérifier" @@ -1101,18 +1339,30 @@ msgstr "Action" msgid "No Attendees Assigned to Event" msgstr "Pas de participant assigné à l'événement" +<<<<<<< HEAD #: Checkin.php:480 Include/Functions.php:1658 Reports/CanvassReports.php:245 +======= +#: Checkin.php:472 Include/Functions.php:1658 Reports/CanvassReports.php:245 +>>>>>>> master #: Reports/VotingMembers.php:88 queryparameteroptions_qpo.php:15 msgid "Member" msgstr "Membre" +<<<<<<< HEAD #: Checkin.php:482 ChurchCRM/Service/PersonService.php:38 msgid " of the" msgstr " de la" #: Checkin.php:484 ChurchCRM/Service/PersonService.php:40 PersonView.php:267 +======= +#: Checkin.php:474 ChurchCRM/Service/PersonService.php:38 +msgid " of the" +msgstr " de la" + +#: Checkin.php:476 ChurchCRM/Service/PersonService.php:40 PersonView.php:267 +>>>>>>> master msgid "(No assigned family)" -msgstr "(Aucune Famille assignée)" +msgstr "(Aucune Famille assignée)" #: ConvertIndividualToFamily.php:47 #, fuzzy @@ -1179,40 +1429,54 @@ msgstr "Rapports annuaires" #: DirectoryReports.php:82 msgid "Select classifications to include" -msgstr "Choisissez les classifications à inclure" +msgstr "Choisissez les classifications à inclure" #: DirectoryReports.php:118 msgid "Which role is the head of household?" -msgstr "Quel est le Rôle du responsable ?" +msgstr "Quel est le Rôle du responsable ?" #: DirectoryReports.php:136 msgid "Which role is the spouse?" -msgstr "Quel est le Rôle du conjoint?" +msgstr "Quel est le Rôle du conjoint?" #: DirectoryReports.php:155 msgid "Which role is a child?" -msgstr "Quel Rôle de l'enfant?" +msgstr "Quel Rôle de l'enfant?" #: DirectoryReports.php:174 #, fuzzy msgid "Information to Include" -msgstr "Information à Inclure" +msgstr "Information à Inclure" +<<<<<<< HEAD #: AutoPaymentEditor.php:690 AutoPaymentEditor.php:695 CartToFamily.php:239 #: CartToFamily.php:244 CartView.php:287 CSVExport.php:105 CSVExport.php:110 +======= +#: 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 "Adresse" #: 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" @@ -1220,33 +1484,41 @@ msgstr "Anniversaire" #: DirectoryReports.php:180 msgid "Family Home Phone" -msgstr "Téléphone de la famille" +msgstr "Téléphone de la famille" +<<<<<<< HEAD #: ChurchCRM/tasks/FamilyWorkPhoneTask.php:30 DirectoryReports.php:181 +======= +#: DirectoryReports.php:181 +>>>>>>> master msgid "Family Work Phone" -msgstr "Téléphone Professionnel de la famille" +msgstr "Téléphone Professionnel de la famille" #: DirectoryReports.php:182 msgid "Family Cell Phone" -msgstr "Téléphone Portable de la famille" +msgstr "Téléphone Portable de la famille" #: 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 "Email de la famille" #: DirectoryReports.php:185 msgid "Personal Home Phone" -msgstr "Téléphone Personnel" +msgstr "Téléphone Personnel" #: DirectoryReports.php:186 msgid "Personal Work Phone" -msgstr "Téléphone Personnel du travail" +msgstr "Téléphone Personnel du travail" #: DirectoryReports.php:187 msgid "Personal Cell Phone" -msgstr "Téléphone Portable Personnel" +msgstr "Téléphone Portable Personnel" #: DirectoryReports.php:188 msgid "Personal Email" @@ -1294,7 +1566,7 @@ msgstr "Avertissement" #: DirectoryReports.php:289 msgid "Create Directory" -msgstr "Créer l'annuaire" +msgstr "Créer l'annuaire" #: DonatedItemEditor.php:47 #, fuzzy @@ -1362,22 +1634,22 @@ msgstr "Gestionnaire de Cotisations par Associations" #: DonationFundEditor.php:119 msgid "Are you sure you want to delete this fund?" -msgstr "Etes vous sûr de vouloir supprimer ce fond ?" +msgstr "Etes vous sûr de vouloir supprimer ce fond ?" #: DonationFundEditor.php:129 msgid "Warning: Field changes will be lost if you do not 'Save Changes' before using a delete or 'add new' button!" -msgstr "Attention: Les champs modifiés seront perdus si vous ne 'Sauvez pas les Changements' avant d'utiliser les boutons supprimer ou 'ajouter nouveau !" +msgstr "Attention: Les champs modifiés seront perdus si vous ne 'Sauvez pas les Changements' avant d'utiliser les boutons supprimer ou 'ajouter nouveau !" #: DonationFundEditor.php:135 FamilyCustomFieldsEditor.php:325 #: GroupPropsFormEditor.php:276 OptionManager.php:314 #: PersonCustomFieldsEditor.php:307 PersonEditor.php:571 #: VolunteerOpportunityEditor.php:354 msgid "Invalid fields or selections. Changes not saved! Please correct and try again!" -msgstr "Champs ou choix invalides. Changements non sauvés! Svp corrigez et essayez à nouveau !" +msgstr "Champs ou choix invalides. Changements non enregistrés ! Svp corrigez et essayez à nouveau !" #: DonationFundEditor.php:147 msgid "No funds have been added yet" -msgstr "Aucune fonds n'a encore été ajoutée pour l'instant" +msgstr "Aucune fonds n'a encore été ajoutée pour l'instant" #: DonationFundEditor.php:155 EventEditor.php:551 GroupView.php:283 #: KioskManager.php:34 ListEvents.php:219 @@ -1446,11 +1718,19 @@ msgstr "Listing des Paiements par internet" msgid "Add a New Electronic Payment Method" msgstr "Ajouter une nouvelle méthode de Paiment par internet" +<<<<<<< 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 @@ -1459,7 +1739,11 @@ msgid "Family" msgstr "Familles" #: ElectronicPaymentList.php:199 FamilyCustomFieldsEditor.php:329 +<<<<<<< HEAD #: FamilyCustomFieldsEditor.php:431 FamilyView.php:534 FamilyView.php:639 +======= +#: FamilyCustomFieldsEditor.php:431 FamilyView.php:547 FamilyView.php:655 +>>>>>>> master #: 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 @@ -1467,17 +1751,25 @@ msgstr "Familles" msgid "Type" msgstr "Type" +<<<<<<< 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 "Année Fiscale" +msgstr "Année Fiscale" #: ElectronicPaymentList.php:201 msgid "Next Date" msgstr "Prochaine Date" +<<<<<<< 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 "Montant" @@ -1486,8 +1778,13 @@ msgstr "Montant" msgid "Interval" msgstr "Intervalle" +<<<<<<< HEAD #: AutoPaymentEditor.php:654 ElectronicPaymentList.php:204 FamilyView.php:643 #: FamilyView.php:746 FinancialReports.php:305 SelectDelete.php:215 +======= +#: AutoPaymentEditor.php:868 ElectronicPaymentList.php:204 FamilyView.php:659 +#: FamilyView.php:763 FinancialReports.php:305 SelectDelete.php:215 +>>>>>>> master msgid "Fund" msgstr "Fond" @@ -1515,15 +1812,20 @@ msgstr "Mois" #: ElectronicPaymentList.php:215 FamilyEditor.php:953 #: Include/Functions.php:105 msgid "Year" -msgstr "Année" +msgstr "Année" #: ElectronicPaymentList.php:218 msgid "Vanco CC" msgstr "Vanco CC " #: 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 @@ -1569,7 +1871,7 @@ msgstr "Date de l'événement" #: EventAttendance.php:107 #, fuzzy msgid "Generate Report" -msgstr "Créer un Rapport" +msgstr "Créer un Rapport" #: EventAttendance.php:140 msgid "Attending Members" @@ -1611,7 +1913,7 @@ msgstr "erreurs. Voir ci-dessous" #: EventEditor.php:414 #, fuzzy msgid "Items with a " -msgstr "Elémenti avec un :" +msgstr "Eléments avec un :" #: EventEditor.php:414 #, fuzzy @@ -1720,27 +2022,27 @@ msgstr "Editeur de Champs Personnalisés pour les Familles" #: FamilyCustomFieldsEditor.php:177 PersonCustomFieldsEditor.php:159 msgid "Default Option" -msgstr "Option par Défaut" +msgstr "Option par Défaut" #: FamilyCustomFieldsEditor.php:296 #, fuzzy msgid "Warning: By deleting this field, you will irrevokably lose all family data assigned for this field!" -msgstr "Attention: En supprimant ce champ, vous perdrez de fait toutes les données de personne assignées à ce champ!" +msgstr "Attention: En supprimant ce champ, vous perdrez de fait toutes les données de personne assignées à ce champ!" #: FamilyCustomFieldsEditor.php:308 PersonCustomFieldsEditor.php:290 #, fuzzy 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 "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'" +msgstr "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'" #: FamilyCustomFieldsEditor.php:317 #, fuzzy msgid "No custom Family fields have been added yet" -msgstr "Aucun champ personnalisé n'a encore été ajouté pour l'instant" +msgstr "Aucun champ personnalisé n'a encore été ajouté pour l'instant" #: FamilyCustomFieldsEditor.php:331 GroupPropsFormEditor.php:286 #: PersonCustomFieldsEditor.php:315 msgid "Special option" -msgstr "Option Spéciale" +msgstr "Option Spéciale" #: FamilyCustomFieldsEditor.php:332 FamilyCustomFieldsEditor.php:457 #: PersonCustomFieldsEditor.php:316 PersonCustomFieldsEditor.php:464 @@ -1756,7 +2058,7 @@ msgstr "Vue Famille latéral" #: FamilyCustomFieldsEditor.php:373 GroupPropsFormEditor.php:344 #: PersonCustomFieldsEditor.php:359 msgid "You must select a group." -msgstr "Vous devez sélectionner un groupe." +msgstr "Vous devez sélectionner un groupe." #: FamilyCustomFieldsEditor.php:378 PersonCustomFieldsEditor.php:362 msgid "Edit List Options" @@ -1790,12 +2092,12 @@ msgstr "Vous devez entrer un nom" #: FamilyCustomFieldsEditor.php:451 GroupPropsFormEditor.php:403 #: PersonCustomFieldsEditor.php:452 msgid "That field name already exists." -msgstr "Ce nom de champ existe déjà." +msgstr "Ce nom de champ existe déjà." #: FamilyCustomFieldsEditor.php:461 PersonCustomFieldsEditor.php:458 #, fuzzy msgid "Side" -msgstr "Côté" +msgstr "Côté" #: FamilyCustomFieldsEditor.php:467 GroupPropsFormEditor.php:414 #: PersonCustomFieldsEditor.php:468 @@ -1813,7 +2115,7 @@ msgstr "Le prénom doit être saisi" #: FamilyEditor.php:208 PersonEditor.php:204 msgid "Invalid Year: allowable values are 1901 to 2155" -msgstr "Année Invalide: les valeurs permises sont comprise entre 1901 et 2155" +msgstr "Année Invalide: les valeurs permises sont comprise entre 1901 et 2155" #: FamilyEditor.php:212 PersonEditor.php:208 msgid "Invalid Birth Date." @@ -1854,7 +2156,7 @@ msgstr "Ok pour la campagne" #: FamilyEditor.php:834 #, fuzzy msgid "Assign a Canvasser" -msgstr "Assigné un solliciteur " +msgstr "Assigné un solliciteur " #: FamilyEditor.php:852 #, fuzzy @@ -1867,17 +2169,21 @@ msgstr "Info enveloppe" #: FamilyEditor.php:895 PersonEditor.php:1097 msgid "Custom Fields" -msgstr "Champs Personnalisés" +msgstr "Champs Personnalisés" #: 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 "Membres de la Famille" #: FamilyEditor.php:939 msgid "You may create family members now or add them later. All entries will become new person records." -msgstr "Vous devriez créer les membres de famille maintenant ou les ajouter plus tard. Toutes les entrées deviendront de nouveaux enregistrements de personne." +msgstr "Vous devriez créer les membres de famille maintenant ou les ajouter plus tard. Toutes les entrées deviendront de nouveaux enregistrements de personne." #: FamilyEditor.php:945 msgid "First" @@ -1891,7 +2197,11 @@ msgstr "Milieu" msgid "Last" msgstr "Dernier" +<<<<<<< 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" @@ -1903,12 +2213,12 @@ msgstr "Jour" #: FamilyEditor.php:993 PersonEditor.php:588 msgid "Select Gender" -msgstr "Sélectionner Sexe" +msgstr "Sélectionner Sexe" #: CartToGroup.php:89 FamilyEditor.php:1007 GroupReports.php:62 #: PersonToGroup.php:80 msgid "Select Role" -msgstr "Sélectionner Rôle" +msgstr "Sélectionner Rôle" #: ChurchCRM/Service/DashboardService.php:59 #: ChurchCRM/Service/DashboardService.php:73 @@ -1924,7 +2234,7 @@ msgstr "Janvier" #: FamilyEditor.php:1029 PersonEditor.php:660 msgid "February" -msgstr "Février" +msgstr "Février" #: FamilyEditor.php:1032 PersonEditor.php:663 msgid "March" @@ -1948,7 +2258,7 @@ msgstr "Juillet" #: FamilyEditor.php:1047 PersonEditor.php:678 msgid "August" -msgstr "Août " +msgstr "Août " #: FamilyEditor.php:1050 PersonEditor.php:681 msgid "September" @@ -1964,13 +2274,17 @@ msgstr "Novembre" #: FamilyEditor.php:1059 PersonEditor.php:690 msgid "December" -msgstr "Décembre" +msgstr "Décembre" #: FamilyEditor.php:1064 msgid "Unk" msgstr "N/D" +<<<<<<< HEAD #: FamilyList.php:29 FamilyView.php:312 +======= +#: FamilyList.php:29 FamilyView.php:319 +>>>>>>> master msgid "Family List" msgstr "Liste des Familles" @@ -1979,7 +2293,11 @@ msgid "Add Family" msgstr "Ajouter une Famille" #: ChurchCRM/model/ChurchCRM/Person.php:103 FamilyEditor.php:436 +<<<<<<< HEAD #: FamilyList.php:48 Menu.php:205 PersonEditor.php:380 +======= +#: FamilyList.php:48 Menu.php:211 PersonEditor.php:380 +>>>>>>> master msgid "Created" msgstr "Créé" @@ -1991,6 +2309,7 @@ msgstr "Edité" msgid "Family View" msgstr "Vue Famille" +<<<<<<< HEAD #: FamilyView.php:226 msgid " of church
    " msgstr " de l'église
    " @@ -2000,11 +2319,23 @@ msgid "Latitude/Longitude" msgstr "Latitude / Longitude" #: FamilyEditor.php:881 FamilyView.php:249 ManageEnvelopes.php:170 +======= +#: FamilyView.php:230 +msgid " of church
    " +msgstr " de l'église
    " + +#: FamilyView.php:236 +msgid "Latitude/Longitude" +msgstr "Latitude / Longitude" + +#: FamilyEditor.php:881 FamilyView.php:254 ManageEnvelopes.php:170 +>>>>>>> master #: PledgeEditor.php:528 #, fuzzy msgid "Envelope Number" msgstr "Numéro d'Enveloppe" +<<<<<<< HEAD #: FamilyView.php:302 msgid "Verify Info" msgstr "Vérifier les infos" @@ -2026,9 +2357,33 @@ msgid "Delete this Family" msgstr "Effacer cette famille" #: FamilyView.php:196 PersonView.php:197 +======= +#: FamilyView.php:309 +msgid "Verify Info" +msgstr "Vérifier les infos" + +#: FamilyView.php:311 +msgid "Add New Member" +msgstr "Ajouter un nouveau membre" + +#: FamilyView.php:315 +msgid "Previous Family" +msgstr "Famille précédente" + +#: FamilyView.php:323 +msgid "Next Family" +msgstr "Famille suivante" + +#: FamilyView.php:329 +msgid "Delete this Family" +msgstr "Effacer cette famille" + +#: FamilyView.php:199 PersonView.php:197 +>>>>>>> master msgid "Upload Photo" -msgstr "Télécharger Photo" +msgstr "Télécharger Photo" +<<<<<<< HEAD #: FamilyView.php:200 PersonView.php:201 msgid "Delete Photo" msgstr "Effacer Photo" @@ -2054,28 +2409,72 @@ msgid "Pledges and Payments" msgstr "Contributions et paiements" #: FamilyView.php:527 PersonView.php:647 PrintView.php:446 +======= +#: FamilyView.php:204 PersonView.php:201 +msgid "Delete Photo" +msgstr "Effacer Photo" + +#: FamilyView.php:338 PersonView.php:353 +msgid "Add a Note" +msgstr "Ajouter une note" + +#: FamilyView.php:343 +msgid "Add All Family Members to Cart" +msgstr "Ajouter tous les membres de la famille au panier" + +#: FamilyView.php:447 PersonView.php:379 +msgid "Timeline" +msgstr "Chronologie" + +#: FamilyView.php:453 +msgid "Automatic Payments" +msgstr "Paiements automatiques" + +#: FamilyView.php:455 +msgid "Pledges and Payments" +msgstr "Contributions et paiements" + +#: FamilyView.php:540 PersonView.php:647 PrintView.php:446 +>>>>>>> master msgid "No property assignments." -msgstr "Aucune Propriétés n'est attribuées." +msgstr "Aucune Propriétés n'est attribuées." +<<<<<<< HEAD #: 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 "Valeur" +<<<<<<< HEAD #: FamilyView.php:539 FamilyView.php:577 GroupView.php:359 GroupView.php:395 msgid "Edit Value" msgstr "Modifier la Valeur" #: FamilyView.php:600 PersonView.php:688 +======= +#: FamilyView.php:552 FamilyView.php:590 GroupView.php:359 GroupView.php:395 +msgid "Edit Value" +msgstr "Modifier la Valeur" + +#: FamilyView.php:613 PersonView.php:688 +>>>>>>> master #, fuzzy msgid "Assign a New Property" msgstr "Assigner une Nouvelle Propriété" +<<<<<<< HEAD #: FamilyView.php:618 GroupView.php:433 PersonView.php:724 PersonView.php:810 +======= +#: FamilyView.php:634 GroupView.php:433 PersonView.php:724 PersonView.php:810 +>>>>>>> master #: PropertyAssign.php:189 SelectList.php:1081 msgid "Assign" msgstr "Affecter" +<<<<<<< HEAD #: FamilyView.php:640 msgid "Next payment date" msgstr "Prochaine date de paiement" @@ -2089,9 +2488,25 @@ msgid "Date Updated" msgstr "Mise à jour Date" #: FamilyView.php:647 FamilyView.php:757 SelectDelete.php:223 +======= +#: FamilyView.php:656 +msgid "Next payment date" +msgstr "Prochaine date de paiement" + +#: FamilyView.php:658 +msgid "Interval (months)" +msgstr "Intervalle (en mois)" + +#: FamilyView.php:662 FamilyView.php:773 SelectDelete.php:222 +msgid "Date Updated" +msgstr "Mise à jour Date" + +#: FamilyView.php:663 FamilyView.php:774 SelectDelete.php:223 +>>>>>>> master msgid "Updated By" -msgstr "Mise à jour par" +msgstr "Mise à jour par" +<<<<<<< HEAD #: FamilyView.php:713 msgid "Add a new automatic payment" msgstr "Ajouter un nouveau Paiement automatique" @@ -2105,25 +2520,54 @@ msgid "Show Payments" msgstr "Voir Paiement" #: FamilyView.php:730 +======= +#: FamilyView.php:729 +msgid "Add a new automatic payment" +msgstr "Ajouter un nouveau Paiement automatique" + +#: FamilyView.php:741 +msgid "Show Pledges" +msgstr "Voir les contributions" + +#: FamilyView.php:745 +msgid "Show Payments" +msgstr "Voir Paiement" + +#: FamilyView.php:746 +>>>>>>> master #, fuzzy msgid "Since" msgstr "depuis" +<<<<<<< HEAD #: FamilyView.php:738 MemberRoleChange.php:120 PropertyAssign.php:191 +======= +#: FamilyView.php:754 MemberRoleChange.php:120 PropertyAssign.php:191 +>>>>>>> master msgid "Update" -msgstr "Mise à jour" +msgstr "Mise à jour" +<<<<<<< HEAD #: FamilyView.php:745 msgid "Pledge or Payment" msgstr "Contribution ou paiement" #: AutoPaymentEditor.php:632 CanvassEditor.php:198 DepositSlipEditor.php:82 #: EditEventAttendees.php:33 FamilyView.php:748 FindFundRaiser.php:241 +======= +#: FamilyView.php:762 +msgid "Pledge or Payment" +msgstr "Contribution ou paiement" + +#: 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 "Date" +<<<<<<< HEAD #: FamilyView.php:750 msgid "NonDeductible" msgstr "Non déductibles" @@ -2133,10 +2577,22 @@ msgid "Schedule" msgstr "Calendrier" #: FamilyView.php:752 SelectDelete.php:220 +======= +#: FamilyView.php:767 +msgid "NonDeductible" +msgstr "Non déductibles" + +#: FamilyView.php:768 SelectDelete.php:219 +msgid "Schedule" +msgstr "Calendrier" + +#: FamilyView.php:769 SelectDelete.php:220 +>>>>>>> master #, fuzzy msgid "Method" -msgstr "Méthode" +msgstr "Méthode" +<<<<<<< HEAD #: FamilyView.php:753 PledgeEditor.php:725 SelectDelete.php:221 msgid "Comment" msgstr "Commenter" @@ -2150,6 +2606,21 @@ msgid "Add a new payment" msgstr "Ajouter un nouveau paiement" #: FamilyView.php:858 +======= +#: FamilyView.php:770 PledgeEditor.php:725 SelectDelete.php:221 +msgid "Comment" +msgstr "Commenter" + +#: FamilyView.php:862 +msgid "Add a new pledge" +msgstr "Ajouter un nouvel contribution" + +#: FamilyView.php:864 +msgid "Add a new payment" +msgstr "Ajouter un nouveau paiement" + +#: FamilyView.php:875 +>>>>>>> master msgid " Canvass Entry" msgstr " début de campagne" @@ -2158,12 +2629,17 @@ msgstr " début de campagne" msgid "Close" msgstr "Fermer" +<<<<<<< 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 #, fuzzy msgid "Confirm Delete" msgstr "Confirmer Suppression" +<<<<<<< HEAD #: FamilyView.php:884 PersonView.php:901 msgid "You are about to delete the profile photo, this procedure is irreversible." msgstr "Vous êtes sur le point d'effacer la photo de pofile, cette opération est irréversible." @@ -2185,6 +2661,29 @@ msgid "We could not find the family you were looking for.
    Meanwhile, you may" msgstr "La famille recherchée n'a pas été trouvée.
    En attendant, vous pourrez" #: FamilyView.php:951 PersonView.php:1013 +======= +#: FamilyView.php:901 PersonView.php:901 +msgid "You are about to delete the profile photo, this procedure is irreversible." +msgstr "Vous êtes sur le point d'effacer la photo de pofile, cette opération est irréversible." + +#: FamilyView.php:903 PersonView.php:903 +msgid "Do you want to proceed?" +msgstr "Voulez-vous continuer ?" + +#: FamilyView.php:930 +msgid "You are about to email copy of the family information in pdf to the following emails" +msgstr "Vous êtes sur le point d'envoyer une copie PDF des informations d'une famille aux emails suivants" + +#: FamilyView.php:967 +msgid "Oops! Family not found." +msgstr "Oh! Famille non trouvé." + +#: FamilyView.php:970 +msgid "We could not find the family you were looking for.
    Meanwhile, you may" +msgstr "La famille recherchée n'a pas été trouvée.
    En attendant, vous pourrez" + +#: FamilyView.php:971 PersonView.php:1007 +>>>>>>> master msgid "return to member dashboard" msgstr "retourner au tableau de bord" @@ -2204,7 +2703,7 @@ msgstr "Type de Rapport" #: FinancialReports.php:59 #, fuzzy msgid "Select Report Type" -msgstr "Sélectionnez un Type de Rapport" +msgstr "Sélectionnez un Type de Rapport" #: FinancialReports.php:60 msgid "Pledge Summary" @@ -2303,7 +2802,7 @@ msgstr "Vérifier" #: FinancialReports.php:266 PledgeEditor.php:584 msgid "Cash" -msgstr "Espèce" +msgstr "Espèce" #: FinancialReports.php:268 FindDepositSlip.php:53 PledgeEditor.php:600 msgid "Bank Draft" @@ -2417,7 +2916,7 @@ msgstr "Arrière" #: FinancialReports.php:337 GroupReports.php:155 ReminderReport.php:54 #: TaxReport.php:52 msgid "Create Report" -msgstr "Créer un Rapport" +msgstr "Créer un Rapport" #: FindDepositSlip.php:25 #, fuzzy @@ -2475,7 +2974,7 @@ msgstr "Effacer le filtres" #: FindFundRaiser.php:151 SelectList.php:828 msgid "Previous Page" -msgstr "Page Précédente" +msgstr "Page Précédente" #: FindFundRaiser.php:193 SelectList.php:869 msgid "Next Page" @@ -2654,7 +3153,7 @@ msgstr "du groupe" #: GroupEditor.php:119 GroupPropsFormEditor.php:325 msgid "Select a group" -msgstr "Sélectionner groupe" +msgstr "Sélectionner groupe" #: GroupEditor.php:133 msgid "Group Specific Properties: " @@ -2666,7 +3165,7 @@ msgstr "Activer" #: GroupEditor.php:139 GroupView.php:148 msgid "Edit Group-Specific Properties Form" -msgstr "Modifier les Propriétés Spécifiques du Formulaire pour un Groupe" +msgstr "Modifier les Propriétés Spécifiques du Formulaire pour un Groupe" #: GroupEditor.php:141 GroupView.php:283 msgid "Disabled" @@ -2679,7 +3178,7 @@ msgstr "Activer propriétés spécifiques de groupe" #: GroupEditor.php:159 #, fuzzy msgid "Group Roles" -msgstr "Rôles du Groupe" +msgstr "Rôles du Groupe" #: GroupEditor.php:165 msgid "Group role name changes are saved as soon as the box loses focus" @@ -2688,7 +3187,7 @@ msgstr "Le nom du rôle de groupe est enregistré quand la boîte de diaglogue n #: GroupEditor.php:171 MemberRoleChange.php:96 #, fuzzy msgid "New Role" -msgstr "Nouveau Rôle" +msgstr "Nouveau Rôle" #: GroupEditor.php:173 msgid "Add New Role" @@ -2712,11 +3211,15 @@ msgstr "Editeur Propriétés des Membres du Groupe" #: GroupPropsEditor.php:124 msgid "This group currently has no properties! You can add them in the Group Editor." -msgstr "Ce groupe n'a actuellement aucune Propriété! Vous pouvez l'ajouter dans l'éditeur de Groupe." +msgstr "Ce groupe n'a actuellement aucune Propriété! Vous pouvez l'ajouter dans l'éditeur de Groupe." #: GroupPropsEditor.php:126 msgid "Return to Person Record" +<<<<<<< HEAD msgstr "Retourner à de votre enregistrement des personnes" +======= +msgstr "Retourner à de votre enregistrement des personnes" +>>>>>>> master #: GroupPropsEditor.php:134 msgid "Editing" @@ -2724,19 +3227,19 @@ msgstr "Editer;" #: GroupPropsEditor.php:134 msgid "data for member" -msgstr "données du membre" +msgstr "données du membre" #: GroupPropsFormEditor.php:42 msgid "Group-Specific Properties Form Editor:" -msgstr "Éditeur de Formulaire des Propriétés Spécifiques du Groupe:" +msgstr "Éditeur de Formulaire des Propriétés Spécifiques du Groupe:" #: GroupPropsFormEditor.php:264 msgid "No properties have been added yet" -msgstr "Aucune Propriété n'a encore été ajouté" +msgstr "Aucune Propriété n'a encore été ajouté" #: GroupPropsFormEditor.php:270 msgid "Warning: Field changes will be lost if you do not 'Save Changes' before using an up, down, delete, or 'add new' button!" -msgstr "Attention: Les champs modifiés seront perdus si vous ne 'Sauvez les Changements' avant'utiliser les bouton haut, bas, supprimer ou 'ajouter nouveau'" +msgstr "Attention: Les champs modifiés seront perdus si vous ne 'Sauvez les Changements' avant'utiliser les bouton haut, bas, supprimer ou 'ajouter nouveau'" #: GroupPropsFormEditor.php:287 msgid "Show in" @@ -2753,7 +3256,7 @@ msgstr "Rapports du Groupe" #: GroupReports.php:42 #, fuzzy msgid "Select the group you would like to report" -msgstr "Sélectionnez le groupe pour lequel vous voulez un rapport" +msgstr "Sélectionnez le groupe pour lequel vous voulez un rapport" #: GroupReports.php:64 msgid "No Role Selected" @@ -2767,19 +3270,19 @@ msgstr "Seulement le Panier des Personnes?" #: GroupReports.php:76 #, fuzzy msgid "Report Model" -msgstr "Modèle de Rapport" +msgstr "Modèle de Rapport" #: GroupReports.php:77 msgid "Report for group and role selected" -msgstr "Rapport du groupe et rôle sélectionnés" +msgstr "Rapport du groupe et rôle sélectionnés" #: GroupReports.php:78 msgid "Report for any role in group selected" -msgstr "Rapport pour tout rôle dans groupe choisi" +msgstr "Rapport pour tout rôle dans groupe choisi" #: GroupReports.php:104 msgid "Select which information you want to include" -msgstr "Sélectionnez informations à inclure" +msgstr "Sélectionnez informations à inclure" #: GroupReports.php:126 #, fuzzy @@ -2792,7 +3295,7 @@ msgstr "Autre Email" #: GroupReports.php:134 msgid "GroupRole" -msgstr "Rôle du Groupe" +msgstr "Rôle du Groupe" #: GroupReports.php:138 #, fuzzy @@ -2830,7 +3333,11 @@ msgstr "Merci de confirmer la suppression de votre enregistrement du groupe" #: GroupView.php:498 msgid "This will also delete all Roles and Group-Specific Property data associated with this Group record." +<<<<<<< HEAD msgstr "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." +======= +msgstr "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." +>>>>>>> master #: GroupView.php:500 msgid "All group membership and properties will be destroyed. The group members themselves will not be altered." @@ -2882,21 +3389,33 @@ msgstr "Total des Membres" #: GroupView.php:266 #, fuzzy msgid "Default Role" +<<<<<<< HEAD msgstr "Rôle par Défaut" +======= +msgstr "Rôle par Défaut" +>>>>>>> master #: GroupView.php:297 #, fuzzy msgid "Group-Specific Properties" +<<<<<<< HEAD msgstr "Propriétés Spécifiques au Groupe" +======= +msgstr "Propriétés Spécifiques au Groupe" +>>>>>>> master #: GroupView.php:337 msgid "Disabled for this group." msgstr "Désactivé pour ce groupe." +<<<<<<< HEAD #: FamilyView.php:438 GroupView.php:342 PersonView.php:382 PrintView.php:435 +======= +#: FamilyView.php:449 GroupView.php:342 PersonView.php:382 PrintView.php:435 +>>>>>>> master #, fuzzy msgid "Assigned Properties" -msgstr "Propriétés Assignées" +msgstr "Propriétés Assignées" #: GroupView.php:450 msgid "Group Members:" @@ -2993,6 +3512,7 @@ msgstr "Mot de passe invalide" msgid "Too many failed logins: your account has been locked. Please contact an administrator." msgstr "Trop d'échecs d'authentification : votre compte a été verrouillé. contacter un administrateur." +<<<<<<< HEAD #: Login.php:162 msgid "Please Login" msgstr "Merci de vous identifier" @@ -3006,8 +3526,23 @@ msgid "Password" msgstr "Mot de Passe" #: Login.php:150 Login.php:207 +======= +#: Login.php:159 +msgid "Please Login" +msgstr "Merci de vous identifier" + +#: ChurchCRM/Emails/users/BaseUserEmail.php:30 Login.php:179 +msgid "Email/Username" +msgstr "Mail/Nom d'utilisateur" + +#: BackupDatabase.php:76 Login.php:184 UserList.php:56 +msgid "Password" +msgstr "Mot de Passe" + +#: Login.php:147 Login.php:198 +>>>>>>> master msgid "Login" -msgstr "Identifiant" +msgstr "Connexion" #: ManageEnvelopes.php:25 menuconfig_mcf.php:21 #, fuzzy @@ -3023,8 +3558,13 @@ msgstr "Mettre à jour enregistrements de la famille " msgid "Update Envelopes" msgstr "Mise à jour des enveloppes" +<<<<<<< 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 "Confirmer" @@ -3041,7 +3581,7 @@ msgstr "Zéro" #: ManageEnvelopes.php:176 #, fuzzy msgid "Assign starting at #" -msgstr "Assignée: le début à #" +msgstr "Assignée le début à #" #: MapUsingGoogle.php:31 msgid "Unable to display map due to missing Church Latitude or Longitude. Please update the church Address in the settings menu." @@ -3063,7 +3603,7 @@ msgstr "Noms des Membres" #: MemberRoleChange.php:92 #, fuzzy msgid "Current Role" -msgstr "Rôle Actuel" +msgstr "Rôle Actuel" #: MembersDashboard.php:15 msgid "Members Dashboard" @@ -3133,11 +3673,11 @@ msgstr "Plus d'info" #: MembersDashboard.php:219 msgid "Reports on groups and roles" -msgstr "Rapport sur les groupes et les rôles" +msgstr "Rapport sur les groupes et les rôles" #: MembersDashboard.php:221 msgid "Report on group and roles selected (it may be a multi-page PDF)." -msgstr "Rapport sur les groupes et rôles sélectionnés (possibilité de page multiple PDF)." +msgstr "Rapport sur les groupes et rôles sélectionnés (possibilité de page multiple PDF)." #: MembersDashboard.php:226 msgid "Members Directory" @@ -3198,7 +3738,7 @@ msgstr "Filles" #: Menu.php:111 sundayschool/SundaySchoolDashboard.php:138 msgid "Sunday School Classes" -msgstr "Classes École du dimanche" +msgstr "Classes école du dimanche" #: Menu.php:176 msgid "Deposit Tracking" @@ -3206,31 +3746,51 @@ msgstr "Suivi du dépôt" #: Menu.php:196 msgid "Latest Families" -msgstr "Dernière famille" +msgstr "Dernière famille" #: 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 "Nom de Famille" +<<<<<<< HEAD #: Menu.php:231 +======= +#: Menu.php:237 +>>>>>>> master msgid "Updated Families" -msgstr "Familles mises à jour" +msgstr "Familles mises à jour" +<<<<<<< HEAD #: ChurchCRM/model/ChurchCRM/Person.php:108 FamilyEditor.php:471 Menu.php:240 +======= +#: ChurchCRM/model/ChurchCRM/Person.php:108 FamilyEditor.php:471 Menu.php:252 +>>>>>>> master #: PersonEditor.php:384 msgid "Updated" -msgstr "Mise à jour" +msgstr "Mise à jour" +<<<<<<< HEAD #: Menu.php:268 +======= +#: Menu.php:280 +>>>>>>> master msgid "Latest Members" -msgstr "Dernier membres ajoutés" +msgstr "Dernier membres ajoutés" +<<<<<<< HEAD #: Menu.php:303 +======= +#: Menu.php:315 +>>>>>>> master msgid "Updated Members" -msgstr "Membres à jour" +msgstr "Membres à jour" #: NoteDelete.php:31 msgid "Note Delete Confirmation" @@ -3247,7 +3807,7 @@ msgstr "Oui, supprimer cet enregistrement" #: NoteDelete.php:72 PropertyDelete.php:67 SelectDelete.php:275 msgid "(this action cannot be undone)" -msgstr "(cette action ne peut être annulée)" +msgstr "(cette action ne peut être annulée)" #: NoteEditor.php:32 msgid "Note Editor" @@ -3255,7 +3815,7 @@ msgstr "Éditeur de Note" #: NoteEditor.php:132 msgid "Private" -msgstr "Privé" +msgstr "Privé" #: Include/Footer.php:81 PropertyAssign.php:47 PropertyEditor.php:43 #: PropertyList.php:28 PropertyTypeEditor.php:93 PropertyTypeList.php:60 @@ -3282,7 +3842,7 @@ msgstr "Erreur: Duplication" #: OptionManager.php:329 msgid "Default" -msgstr "Défaut" +msgstr "Défaut" #: OptionManager.php:357 msgid "Duplicate name found." @@ -3307,7 +3867,7 @@ msgstr "Erreur: Un" #: OptionManager.php:401 msgid " by that name already exists." -msgstr " par ce nom existe déjà." +msgstr " par ce nom existe déjà." #: PaddleNumEditor.php:49 #, fuzzy @@ -3326,7 +3886,7 @@ msgstr "Acheteurs de cette levée de fonds:" #: PaddleNumList.php:45 #, fuzzy msgid "Select all" -msgstr "Sélectionner tous" +msgstr "Sélectionner tous" #: PaddleNumList.php:47 #, fuzzy @@ -3345,7 +3905,7 @@ msgstr "Générer déclaration pour la sélection" #: PaddleNumList.php:57 #, fuzzy msgid "Select" -msgstr "Sélectionner" +msgstr "Sélectionner" #: PersonCustomFieldsEditor.php:28 msgid "Custom Person Fields Editor" @@ -3353,15 +3913,15 @@ msgstr "Editeur de Champs Personnalisés pour les personnes" #: PersonCustomFieldsEditor.php:278 msgid "Warning: By deleting this field, you will irrevokably lose all person data assigned for this field!" -msgstr "Attention: En supprimant ce champ, vous perdrez de fait toutes les données de personne assignées à ce champ!" +msgstr "Attention: En supprimant ce champ, vous perdrez de fait toutes les données de personne assignées à ce champ!" #: PersonCustomFieldsEditor.php:299 msgid "No custom person fields have been added yet" -msgstr "Aucun champ personnalisé n'a encore été ajouté" +msgstr "Aucun champ personnalisé n'a encore été ajouté" #: PersonCustomFieldsEditor.php:317 msgid "Person-View Side" -msgstr "Personne - Fiche Associée" +msgstr "Personne - Fiche Associée" #: PersonEditor.php:25 msgid "Person Editor" @@ -3378,7 +3938,7 @@ msgstr "Date d'amitié invalide " #: PersonEditor.php:231 msgid "Not a valid Membership Date" -msgstr "Date d'Adhésion Invalide" +msgstr "Date d'Adhésion Invalide" #: PersonEditor.php:253 msgid "Work Email is Not Valid" @@ -3390,7 +3950,7 @@ msgstr "Texte Rouge" #: PersonEditor.php:564 PersonView.php:343 msgid "indicates items inherited from the associated family record." -msgstr "indique les objets hérités de l'enregistrement associé à la famille." +msgstr "indique les objets hérités de l'enregistrement associé à la famille." #: PersonEditor.php:577 msgid "Personal Info" @@ -3411,7 +3971,7 @@ msgstr "Mois de Naissance" #: PersonEditor.php:654 msgid "Select Month" -msgstr "Sélectionner un mois" +msgstr "Sélectionner un mois" #: PersonEditor.php:694 #, fuzzy @@ -3420,12 +3980,12 @@ msgstr "Jour de Naissance" #: PersonEditor.php:696 msgid "Select Day" -msgstr "Sélectionner jour" +msgstr "Sélectionner jour" #: PersonEditor.php:711 #, fuzzy msgid "Birth Year" -msgstr "Année de Naissance" +msgstr "Année de Naissance" #: external/templates/registration/family-register-members.php:120 #: PersonEditor.php:724 Reports/ConfirmReport.php:190 @@ -3454,7 +4014,7 @@ msgstr "Ajouter Personne au Panier" #: PersonToGroup.php:61 #, fuzzy msgid "Select the group to add this person to" -msgstr "Sélectionnez groupe pour ajouter la personne" +msgstr "Sélectionnez groupe pour ajouter la personne" #: PersonView.php:34 msgid "Person Profile" @@ -3462,7 +4022,7 @@ msgstr "Profile de la Personne" #: PersonView.php:175 msgid "Not assigned" -msgstr "Non assigné" +msgstr "Non assigné" #: PersonView.php:249 msgid "About Me" @@ -3482,7 +4042,7 @@ msgstr "Effacer cet Enregistrement" #: PersonView.php:364 msgid "Make User" -msgstr "Créer Utilisateur" +msgstr "Créer Utilisateur" #: PersonView.php:368 msgid "Edit User" @@ -3498,11 +4058,11 @@ msgstr "Aucun tâches assignés au groupe" #: PersonView.php:591 msgid "Change Role" -msgstr "Changer rôle" +msgstr "Changer rôle" #: PersonView.php:594 msgid "Update Properties" -msgstr "Mise à jour Propriétés." +msgstr "Mise à jour Propriétés." #: PersonView.php:617 msgid "Assign New Group" @@ -3510,7 +4070,7 @@ msgstr "Assignez Nouveau Groupe" #: PersonView.php:618 msgid "Person will be assigned to the Group in the Default Role." -msgstr "La personne sera assigner au groupe avec le rôle par défaut." +msgstr "La personne sera assigner au groupe avec le rôle par défaut." #: PersonView.php:631 msgid "Assign User to Group" @@ -3529,11 +4089,19 @@ msgstr "Assigner une Nouvelle Propriété de bénévolat" msgid "Are you sure you want to remove this person from the Group" msgstr "Êtes vous sûr de supprimer cette personne du groupe" +<<<<<<< HEAD #: PersonView.php:1010 msgid "Oops! Person not found." msgstr "Oh ! Personne introuvable." #: PersonView.php:1013 +======= +#: PersonView.php:1004 +msgid "Oops! Person not found." +msgstr "Oh ! Personne introuvable." + +#: PersonView.php:1007 +>>>>>>> master msgid "We could not find the person you were looking for.
    Meanwhile, you may" msgstr "La personne recherchée n'a pas été trouvée.
    En attendant, vous pourrez" @@ -3552,7 +4120,7 @@ msgstr "Au moins un fonds doit avoir une valeur non nulle." #: ChurchCRM/Service/FinancialService.php:510 PledgeEditor.php:298 #, fuzzy msgid "Must specify non-zero check number" -msgstr "Vous devez écrire un nombre différent de 0." +msgstr "Vous devez écrire un nombre différent de 0." #: ChurchCRM/Service/FinancialService.php:515 PledgeEditor.php:305 msgid "Check number not valid for 'CASH' payment" @@ -3597,7 +4165,7 @@ msgstr "Calendrier de paiement" #: PledgeEditor.php:544 msgid "Select Schedule" -msgstr "Sésectionner type calendrier" +msgstr "Sésectionner type calendrier" #: EventNames.php:171 PledgeEditor.php:547 msgid "Weekly" @@ -3641,7 +4209,7 @@ msgstr "Compte bancaire" #: PledgeEditor.php:672 #, fuzzy msgid "Scan check" -msgstr "Scan du chèque" +msgstr "Scan du chèque" #: PledgeEditor.php:681 msgid "find family from check account #" @@ -3666,7 +4234,11 @@ msgstr "Aperçu Avant Impression" #: PrintView.php:325 Reports/CanvassReports.php:244 #: sundayschool/SundaySchoolClassView.php:201 +<<<<<<< HEAD #: sundayschool/SundaySchoolDashboard.php:184 +======= +#: sundayschool/SundaySchoolDashboard.php:196 +>>>>>>> master msgid "Age" msgstr "Age" @@ -3687,13 +4259,13 @@ msgstr "Notes:" msgid "Entered:" msgstr "Saisie le : " -#: ChurchCRM/Service/TimelineService.php:124 PrintView.php:484 +#: ChurchCRM/Service/TimelineService.php:126 PrintView.php:484 msgid "by" msgstr "par" #: PropertyAssign.php:128 PropertyAssign.php:146 msgid "Property successfully assigned." -msgstr "La Propriété a été assignée avec succès." +msgstr "La Propriété a été assignée avec succès." #: PropertyAssign.php:161 msgid " Property Assignment" @@ -3702,7 +4274,7 @@ msgstr " Attribution de Propriété" #: PropertyAssign.php:175 #, fuzzy msgid "Assigning" -msgstr "Assignée" +msgstr "Assignée" #: PropertyDelete.php:28 msgid "Property Delete Confirmation" @@ -3729,11 +4301,11 @@ msgstr "Éditeur de Propriété" #: PropertyEditor.php:81 #, fuzzy msgid "You must select a type" -msgstr "Vous devez sélectionner un Type" +msgstr "Vous devez sélectionner un Type" #: PropertyEditor.php:135 msgid "Select Property Type" -msgstr "Sélectionnez un Type de Propriété" +msgstr "Sélectionnez un Type de Propriété" #: PropertyEditor.php:160 PropertyList.php:65 msgid "A" @@ -3773,7 +4345,7 @@ msgstr "Ce type de Propriété est encore utilisé par au moins une propriété. #: PropertyTypeDelete.php:62 msgid "If you delete this type, you will also remove all properties using" -msgstr "Si vous supprimez ce type, vous enlèverez également tout les Propriétés utilisées" +msgstr "Si vous supprimez ce type, vous enlèverez également tout les Propriétés utilisées" #: PropertyTypeDelete.php:62 msgid "it and lose any corresponding property assignments." @@ -3797,8 +4369,13 @@ msgid "Add a New Property Type" msgstr "Ajouter Nouveau Type de Propriété" #: 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 "Classe" @@ -3808,11 +4385,11 @@ msgstr "Propriétés" #: PropertyUnassign.php:98 msgid " Property Unassignment" -msgstr " Propriété non Assignée" +msgstr " Propriété non Assignée" #: PropertyUnassign.php:105 msgid "Please confirm removal of this property from this" -msgstr "Veuillez confirmer le déplacement de cette Propriété" +msgstr "Veuillez confirmer le déplacement de cette Propriété" #: PropertyUnassign.php:114 #, fuzzy @@ -3833,11 +4410,11 @@ msgstr "Listing des Query" #: QueryList.php:36 msgid "Run a Free-Text Query" -msgstr "Exécuter une Requête Libre" +msgstr "Exécuter une Requête Libre" #: QuerySQL.php:23 msgid "Free-Text Query" -msgstr "Requête Texte Libre" +msgstr "Requête Texte Libre" #: QuerySQL.php:50 msgid "Export Results to CSV file" @@ -3845,7 +4422,7 @@ msgstr "Exporter les résultats vers un fichier CSV" #: QuerySQL.php:58 msgid "Execute SQL" -msgstr "Exécuter SQL" +msgstr "Exécuter SQL" #: QuerySQL.php:86 QuerySQL.php:136 msgid "An error occured: " @@ -3853,21 +4430,21 @@ msgstr "Une erreur s'est produite: " #: QuerySQL.php:121 QueryView.php:182 QueryView.php:204 msgid " record(s) returned" -msgstr " enregistrement(s) retourné(s)" +msgstr " enregistrement(s) retourné(s)" #: QuerySQL.php:186 msgid "Add Results To Cart" -msgstr "Ajouter Résultats au Panier" +msgstr "Ajouter Résultats au Panier" #: QuerySQL.php:187 #, fuzzy msgid "Intersect Results With Cart" -msgstr "Intercepter Résultats au Panier" +msgstr "Intercepter Résultats au Panier" #: QuerySQL.php:188 #, fuzzy msgid "Remove Results From Cart" -msgstr "Supprimer Résultats du Panier" +msgstr "Supprimer Résultats du Panier" #: QuerySQL.php:193 msgid "Return to Query Menu" @@ -3883,15 +4460,15 @@ msgstr "Cette valeur est requise." #: QueryView.php:108 msgid "This value must be numeric." -msgstr "Cette valeur doit être numérique." +msgstr "Cette valeur doit être numérique." #: QueryView.php:113 msgid "This value must be at least " -msgstr "Cette valeur doit être au moins " +msgstr "Cette valeur doit être au moins " #: QueryView.php:118 QueryView.php:131 msgid "This value cannot be more than " -msgstr "Cette valeur ne peut pas être supérieure à " +msgstr "Cette valeur ne peut pas être supérieure à " #: QueryView.php:131 QueryView.php:136 msgid " characters long" @@ -3899,15 +4476,15 @@ msgstr " caractères long" #: QueryView.php:136 msgid "This value cannot be less than " -msgstr "Cette valeur ne peut pas être inférieure à " +msgstr "Cette valeur ne peut pas être inférieure à " #: QueryView.php:266 msgid "Run Query Again" -msgstr "Exécuter Requête à Nouveau" +msgstr "Exécuter Requête à Nouveau" #: QueryView.php:384 msgid "Execute Query" -msgstr "Exécutez la Requête " +msgstr "Exécutez la Requête " #: RPCdummy.php:50 msgid "Address Info:" @@ -3948,7 +4525,7 @@ msgstr "Rapports de présence pour l'événement" #: Include/Footer.php:175 RestoreDatabase.php:27 msgid "Restore Database" -msgstr "Restaurer la Base de Données" +msgstr "Restaurer la Base de Données" #: SelectDelete.php:66 msgid "All donations from this family have been moved to another family." @@ -3995,7 +4572,7 @@ msgstr "Merci de confirmer la suppression de votre enregistrement de cette famil #: SelectDelete.php:274 #, fuzzy msgid "Note: This will also delete all Notes associated with this Family record." -msgstr "Note : Ceci supprimera également toutes les notes liées à cet enregistrement Famille." +msgstr "Note : Ceci supprimera également toutes les notes liées à cet enregistrement Famille." #: SelectDelete.php:290 #, fuzzy @@ -4010,7 +4587,11 @@ msgstr "Supprimer de votre enregistrement de la famille ET de ses membres." msgid "Person Listing" msgstr "Liste des Personnes" +<<<<<<< HEAD #: SelectList.php:184 menuconfig_mcf.php:12 +======= +#: SelectList.php:184 menuconfig_mcf.php:13 +>>>>>>> master msgid "Group Assignment Helper" msgstr "Aide De groupe d'assignation" @@ -4037,7 +4618,7 @@ msgstr "Par Famille" #: SelectList.php:554 msgid "By Newest Entries" -msgstr "Par Entrées les plus récentes" +msgstr "Par Entrées les plus récentes" #: SelectList.php:557 msgid "By Recently Edited" @@ -4075,7 +4656,7 @@ msgstr "Tous les Groupes" #: SelectList.php:768 #, fuzzy msgid "All Roles" -msgstr "Tous les Rôle" +msgstr "Tous les Rôle" #: SelectList.php:794 msgid "Listing" @@ -4128,7 +4709,11 @@ msgstr "Permission" msgid "Base URL" msgstr "URL de base" +<<<<<<< HEAD #: ChurchCRM/dto/SystemConfig.php:221 Include/Footer.php:144 +======= +#: ChurchCRM/dto/SystemConfig.php:222 Include/Footer.php:144 +>>>>>>> master #: SystemSettings.php:43 msgid "System Settings" msgstr "Réglages Système" @@ -4151,11 +4736,19 @@ msgstr "Vérification de l'adresse US" msgid "Update Latitude & Longitude" msgstr "Mise à jour Latitude & longitude" +<<<<<<< HEAD #: UserList.php:118 msgid "User Delete Confirmation" msgstr "Confirmation Suppression de l'Utilisateur" #: UserList.php:120 +======= +#: UserList.php:121 +msgid "User Delete Confirmation" +msgstr "Confirmation Suppression de l'Utilisateur" + +#: UserList.php:123 +>>>>>>> master msgid "Please confirm removal of user status from:" msgstr "Veuillez confirmer la suppression du statut utilisateur de :" @@ -4205,7 +4798,7 @@ msgstr "Gestion Propriétés et Classifications" #: UserEditor.php:429 #, fuzzy msgid "Manage Groups and Roles" -msgstr "Gestion des Groupes et Rôles" +msgstr "Gestion des Groupes et Rôles" #: UserEditor.php:436 #, fuzzy @@ -4237,7 +4830,7 @@ msgstr "Administrateur" #: UserEditor.php:465 msgid "(Grants all privileges.)" -msgstr "(Avoir tous les privilèges.)" +msgstr "(Avoir tous les privilèges.)" #: UserEditor.php:468 msgid "Style" @@ -4289,7 +4882,7 @@ msgstr "Vous devez entrer votre nouveau mot de passe dans les deux champs" #: UserPasswordChange.php:136 msgid "Your password choice is too obvious. Please choose something else." -msgstr "Votre mot de passe est trop évident. Veuillez en choisir un autre." +msgstr "Votre mot de passe est trop évident. Veuillez en choisir un autre." #: UserPasswordChange.php:142 msgid "Your new password must be at least" @@ -4297,15 +4890,15 @@ msgstr "Votre nouveau mot de passe doit au moins avoir" #: UserPasswordChange.php:142 msgid "characters" -msgstr "caractères" +msgstr "caractères" #: UserPasswordChange.php:148 msgid "You need to actually change your password (nice try, though!)" -msgstr "Vous devez réellement changer votre mot de passe" +msgstr "Vous devez réellement changer votre mot de passe" #: UserPasswordChange.php:151 msgid "Your new password is too similar to your old one. Be more creative!" -msgstr "Votre nouveau mot de passe est trop similaire à l'ancien. Soyez plus créatif!" +msgstr "Votre nouveau mot de passe est trop similaire à l'ancien. Soyez plus créatif!" #: UserPasswordChange.php:181 msgid "User Password Change" @@ -4317,11 +4910,11 @@ msgstr "L'enregistrement de votre compte indique que vous devez changer votre mo #: UserPasswordChange.php:201 msgid "Enter your current password, then your new password twice. Passwords must be at least" -msgstr "Entrez votre mot de passe actuel, puis votre nouveau mot de passe deux fois. Les mots de passe doivent être au moins" +msgstr "Entrez votre mot de passe actuel, puis votre nouveau mot de passe deux fois. Les mots de passe doivent être au moins" #: UserPasswordChange.php:201 msgid "characters in length." -msgstr "caractères de long." +msgstr "caractères de long." #: UserPasswordChange.php:203 msgid "Enter a new password for this user." @@ -4344,7 +4937,11 @@ msgstr "Nouveau Mot de Passe" msgid "Confirm New Password" msgstr "Confirmation Nouveau Mot de Passe" +<<<<<<< HEAD #: UserList.php:163 +======= +#: UserList.php:166 +>>>>>>> master #, fuzzy msgid "Please confirm the password reset of this user" msgstr "Merci de confirmer le mot de passe de réinitialisation de cet utilisateur" @@ -4407,7 +5004,7 @@ msgstr "Comment avez-vous découvert l'église ? (un membre, le site interne #: calendar.php:10 msgid "Church Calendar" -msgstr "Agenda de l'église" +msgstr "Agenda de l'église" #: eGive.php:74 msgid "eGive Import" @@ -4487,11 +5084,11 @@ msgstr "Vrai / Faux" #: Include/Functions.php:102 msgid "Text Field (50 char)" -msgstr "Champ Texte (50 caractères)" +msgstr "Champ Texte (50 caractères)" #: Include/Functions.php:103 msgid "Text Field (100 char)" -msgstr "Champ Texte (100 caractères)" +msgstr "Champ Texte (100 caractères)" #: Include/Functions.php:104 msgid "Text Field (long)" @@ -4511,11 +5108,11 @@ msgstr "Monnaie" #: Include/Functions.php:110 msgid "Phone Number" -msgstr "Numéro de téléphone" +msgstr "Numéro de téléphone" #: Include/Functions.php:111 msgid "Custom Drop-Down List" -msgstr "Liste déroulante personnalisée" +msgstr "Liste déroulante personnalisée" #: Include/Functions.php:117 msgid "Thank you for registering your ChurchCRM installation." @@ -4569,16 +5166,16 @@ msgstr "Les enregistrements sélectionnés ont bien été supprimé du panier." #: Include/Functions.php:177 msgid "Your cart has been successfully emptied." -msgstr "Votre panier a bien été vidé." +msgstr "Votre panier a bien été vidé." #: Include/Functions.php:195 msgid "item(s) added to the Cart." -msgstr "item(s) ajouté(s) au panier." +msgstr "item(s) ajouté(s) au panier." #: Include/Functions.php:259 #, fuzzy msgid "Select Fiscal Year" -msgstr "Sésectionner l'année fiscale" +msgstr "Sésectionner l'année fiscale" #: Include/Functions.php:565 msgid "pm" @@ -4623,7 +5220,7 @@ msgstr "Printemps" #: Include/Functions.php:1042 msgid "Summer" -msgstr "Eté" +msgstr "Eté" #: Include/Functions.php:1047 msgid "Fall" @@ -4639,23 +5236,23 @@ msgstr "Date invalide" #: Include/Functions.php:1344 msgid "Invalid Year" -msgstr "Année Invalide" +msgstr "Année Invalide" #: Include/Functions.php:1347 msgid "Out of range: Allowable values are 1901 to 2155" -msgstr "Année Invalide: les valeurs permises sont comprise entre 1901 et 2155" +msgstr "Année Invalide: les valeurs permises sont comprise entre 1901 et 2155" #: Include/Functions.php:1360 Include/Functions.php:1376 msgid "Invalid Number" -msgstr "Numéro invalide" +msgstr "Numéro invalide" #: Include/Functions.php:1363 msgid "Number too large. Must be between -2147483648 and 2147483647" -msgstr "Nombre trop grand Celui-ci doit être compris entre -2147483648 et 2147483647" +msgstr "Nombre trop grand Celui-ci doit être compris entre -2147483648 et 2147483647" #: Include/Functions.php:1379 msgid "Money amount too large. Maximum is $999999999.99" -msgstr "Le montant indiqué est trop important. Le Maximum est 999999999.99€" +msgstr "Le montant indiqué est trop important. Le Maximum est 999999999.99€" #: Include/Functions.php:1568 msgid " Bold Italic" @@ -4697,7 +5294,11 @@ msgstr "Quelque information d'ordre général à propos de votre système seront msgid "No personally identifiable information will be submitted unless you purposefully include it." msgstr "Aucune information d'identifications personnels ne seront transmise à moins que vous ne l'incluiez constamment." +<<<<<<< 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 "Tableau de bord" @@ -4734,7 +5335,7 @@ msgstr "Polices" #: Include/LabelFunctions.php:85 #, fuzzy msgid "Label Type" -msgstr "Type d'étiquette" +msgstr "Type d'étiquette" #: Include/LabelFunctions.php:102 msgid "Label Grouping" @@ -4746,7 +5347,7 @@ msgstr "Toute personne" #: Include/LabelFunctions.php:117 msgid "Grouped by Family" -msgstr "Groupé par Famille" +msgstr "Groupé par Famille" #: Include/LabelFunctions.php:122 #, fuzzy @@ -4761,12 +5362,12 @@ msgstr "ligne de départ" #: Include/LabelFunctions.php:145 #, fuzzy msgid "Start Column" -msgstr "Colonne de Départ" +msgstr "Colonne de Départ" #: Include/LabelFunctions.php:157 #, fuzzy msgid "Ignore Incomplete
    Addresses" -msgstr "Ignorez les Adresses
    Incomplète s" +msgstr "Ignorez les Adresses
    Incomplètes" #: Include/LabelFunctions.php:169 #, fuzzy @@ -4821,8 +5422,13 @@ msgstr "Liaison" msgid "City, State, Zip" msgstr "Ville, État, Code postal" +<<<<<<< HEAD #: 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:40 FamilyEditor.php:787 +#: FamilyView.php:241 Reports/ConfirmReportEmail.php:144 +>>>>>>> master #: Reports/ConfirmReport.php:145 msgid "Send Newsletter" msgstr "Envoyer Newsletter" @@ -4842,7 +5448,7 @@ msgstr "Adulte / Enfant" #: Reports/ConfirmReportEmail.php:192 Reports/ConfirmReportEmail.php:210 #, fuzzy msgid "Cell Phone" -msgstr "Téléphone Portable" +msgstr "Téléphone Portable" #: Reports/ConfirmReportEmail.php:193 Reports/ConfirmReportEmail.php:211 #: Reports/ConfirmReport.php:192 Reports/ConfirmReport.php:211 @@ -4982,7 +5588,7 @@ msgstr "S'il vous plaît vous envoyer don à côté de" #: Reports/TaxReport.php:286 #, fuzzy msgid "Gift Amount:" -msgstr "Quantité:" +msgstr "Quantité:" #: Reports/TaxReport.php:289 #, fuzzy @@ -4990,7 +5596,11 @@ msgid "Gift Designation:" msgstr "Description:" #: sundayschool/SundaySchoolClassView.php:38 +<<<<<<< HEAD #: sundayschool/SundaySchoolDashboard.php:226 menuconfig_mcf.php:13 +======= +#: sundayschool/SundaySchoolDashboard.php:238 menuconfig_mcf.php:14 +>>>>>>> master #, fuzzy msgid "Sunday School" msgstr "Ecole du dimanche" @@ -5010,7 +5620,11 @@ msgstr "Hérite de" #: sundayschool/SundaySchoolClassView.php:120 #: sundayschool/SundaySchoolDashboard.php:80 +<<<<<<< HEAD #: sundayschool/SundaySchoolDashboard.php:146 +======= +#: sundayschool/SundaySchoolDashboard.php:152 +>>>>>>> master msgid "Teachers" msgstr "Moniteurs" @@ -5033,7 +5647,11 @@ msgstr "Anniversaire du mois" #: sundayschool/SundaySchoolClassView.php:191 #: sundayschool/SundaySchoolDashboard.php:91 +<<<<<<< HEAD #: sundayschool/SundaySchoolDashboard.php:147 +======= +#: sundayschool/SundaySchoolDashboard.php:153 +>>>>>>> master msgid "Students" msgstr "Etudiants" @@ -5042,9 +5660,15 @@ msgstr "Etudiants" msgid "Mobile" msgstr "Téléphone portable" +<<<<<<< HEAD #: external/templates/verify/verify-family-info.php:25 #: sundayschool/SundaySchoolClassView.php:205 #: sundayschool/SundaySchoolDashboard.php:185 +======= +#: external/templates/verify/verify-family-info.php:26 +#: sundayschool/SundaySchoolClassView.php:205 +#: sundayschool/SundaySchoolDashboard.php:197 +>>>>>>> master msgid "Home Address" msgstr "Adresse personnelle" @@ -5120,7 +5744,11 @@ msgstr "Générer les listes de classe et des feuilles de présence" msgid "Export All Classes, Kids, and Parent to CSV file" msgstr "Exporter toutes les classes, les enfants et les parents dans une fichier SCV" +<<<<<<< HEAD #: sundayschool/SundaySchoolDashboard.php:173 +======= +#: sundayschool/SundaySchoolDashboard.php:179 +>>>>>>> master msgid "Students not in a Sunday School Class" msgstr "Etudiants n'étant pas à l'école du dimanche" @@ -5217,7 +5845,11 @@ msgstr "Visualiser toutes les familles" msgid "Events" msgstr "Evénements" +<<<<<<< HEAD #: FundRaiserEditor.php:35 menuconfig_mcf.php:25 +======= +#: FundRaiserEditor.php:35 menuconfig_mcf.php:26 +>>>>>>> master msgid "Fundraiser" msgstr "Collectes de fonds" @@ -5371,6 +6003,7 @@ msgstr "Se connecter à la base de données restaurée" msgid "Restore Error." msgstr "Erreur de restauration." +<<<<<<< HEAD #: ChurchCRM/dto/SystemConfig.php:214 msgid "Church Information" msgstr "Information de l'église" @@ -5396,6 +6029,33 @@ msgid "Report Settings" msgstr "Réglages Rapport" #: ChurchCRM/dto/SystemConfig.php:223 +======= +#: ChurchCRM/dto/SystemConfig.php:215 +msgid "Church Information" +msgstr "Information de l'église" + +#: ChurchCRM/dto/SystemConfig.php:216 +msgid "User setup" +msgstr "Réglages utilisateur" + +#: ChurchCRM/dto/SystemConfig.php:217 +msgid "Email Setup" +msgstr "Réglages Email" + +#: ChurchCRM/dto/SystemConfig.php:218 +msgid "Member Setup" +msgstr "Réglages Membre" + +#: ChurchCRM/dto/SystemConfig.php:219 +msgid "Map Settings" +msgstr "Réglages carte" + +#: ChurchCRM/dto/SystemConfig.php:220 +msgid "Report Settings" +msgstr "Réglages Rapport" + +#: ChurchCRM/dto/SystemConfig.php:224 +>>>>>>> master msgid "Localization" msgstr "Localisation" @@ -5533,12 +6193,21 @@ msgstr "Ajouter une nouvelle classe" msgid "Export to CSV" msgstr "Exporter au format CSV" +<<<<<<< HEAD #: sundayschool/SundaySchoolDashboard.php:226 #: sundayschool/SundaySchoolDashboard.php:239 msgid "Add" msgstr "Ajouter" #: sundayschool/SundaySchoolDashboard.php:231 +======= +#: sundayschool/SundaySchoolDashboard.php:238 +#: sundayschool/SundaySchoolDashboard.php:251 +msgid "Add" +msgstr "Ajouter" + +#: sundayschool/SundaySchoolDashboard.php:243 +>>>>>>> master msgid "Enter Name" msgstr "Entrer le Nom" @@ -5683,11 +6352,19 @@ msgstr "Effacer tous les fonds" msgid "Deposit Comment" msgstr "Commentaire pour le dépôt" +<<<<<<< HEAD #: Login.php:167 msgid "Your previous session timed out. Please login again." msgstr "Votre précédente session a expiré. Reconnectez-vous." #: Login.php:214 +======= +#: Login.php:164 +msgid "Your previous session timed out. Please login again." +msgstr "Votre précédente session a expiré. Reconnectez-vous." + +#: Login.php:206 +>>>>>>> master msgid "Register a new Family" msgstr "Enregistrer une nouvelle famille" @@ -5740,17 +6417,17 @@ msgstr "item" #: Reports/ConfirmReport.php:125 #, fuzzy msgid "Address 1" -msgstr "Adresse1:" +msgstr "Adresse 1" #: Reports/ConfirmReport.php:130 #, fuzzy msgid "Address 2" -msgstr "Adresse2:" +msgstr "Adresse 2" #: Reports/ConfirmReport.php:191 Reports/ConfirmReport.php:210 #, fuzzy msgid "Cell phone" -msgstr "Téléphone Portable" +msgstr "Téléphone Portable" #: Reports/FundRaiserStatement.php:225 msgid "-----------------------------------------------------------------------------------------------------------------------------------------------" @@ -5767,7 +6444,7 @@ msgstr "Enveloppe:" #: Reports/TaxReport.php:249 #, fuzzy msgid ", Phone: " -msgstr "Téléphone" +msgstr "Téléphone" #: Reports/VotingMembers.php:49 #, fuzzy @@ -5809,7 +6486,7 @@ msgstr "http://www.intelligentsearch.com/address_verification/verify_address.htm #: CanvassAutomation.php:126 FinancialReports.php:205 msgid "Fiscal Year:" -msgstr "Année Fiscale:" +msgstr "Année Fiscale:" #: CanvassAutomation.php:180 CanvassAutomation.php:191 msgid "Important note: this will lose any "Ok To Canvass" fields that have been set by hand." @@ -5823,7 +6500,11 @@ msgstr "Démarcheur:" msgid "Add Attendees for Event" msgstr "Ajouter des " +<<<<<<< HEAD #: Checkin.php:482 ChurchCRM/Service/PersonService.php:38 +======= +#: Checkin.php:474 ChurchCRM/Service/PersonService.php:38 +>>>>>>> master msgid "family" msgstr "Fmaille" @@ -5833,7 +6514,7 @@ msgstr "Date d'Anniversaire:" #: CSVExport.php:421 msgid "Date Entered:" -msgstr "Date d'Entrée:" +msgstr "Date d'Entrée:" #: CSVImport.php:113 Include/Footer.php:191 msgid "CSV Import" @@ -5898,11 +6579,11 @@ msgstr "Désactiver les propriétés spécifiques de groupe" #: GroupPropsFormEditor.php:169 msgid "'Default Option'" -msgstr "'Option par Défaut'" +msgstr "'Option par Défaut'" #: GroupView.php:248 msgid "Text Group" -msgstr "Groupe Texte" +msgstr "Texto au groupe" #: GroupView.php:291 Include/Footer.php:108 msgid "Group Properties" @@ -5936,7 +6617,11 @@ msgstr "Tous" msgid "Family Map" msgstr "Carte" +<<<<<<< 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 "Groupes" @@ -6268,7 +6953,7 @@ msgstr "Principale" #: menuconfig_mcf.php:11 msgid "List Groups" -msgstr "Lister toutes les groupes" +msgstr "Lister tous les groupes" #: Include/Footer.php:113 msgid "Edit Group Types" @@ -8038,10 +8723,6 @@ msgstr "Le nom de l'église est à sa valeur par défaut." msgid "SMTP Server info are blank" msgstr "Serveur SMTP est vide" -#: ChurchCRM/tasks/FamilyWorkPhoneTask.php:35 -msgid "In Church CRM 2.6.0 we will no longer support a work phone for a family" -msgstr "Dans la version 2.6.0, le téléphone professionnel pour la famille ne sera plus supporté" - #: ChurchCRM/tasks/HttpsTask.php:21 msgid "Your system could be more secure by installing an TLS/SSL Cert." msgstr "Votre système serait plus sécurisé avec un certificat TLS/SSL." @@ -8106,22 +8787,23 @@ msgstr "Entrez les champs suivants pour vérification de la famille" msgid "email" msgstr "email" -#: external/templates/verify/verify-family-info.php:7 +#: external/templates/verify/verify-family-info.php:8 msgid "Family Verification" msgstr "Vérification Famille" -#: external/templates/verify/verify-family-info.php:47 +#: external/templates/verify/verify-family-info.php:51 msgid "Family Member(s)" msgstr "Membres Famille" -#: external/templates/verify/verify-family-info.php:74 +#: external/templates/verify/verify-family-info.php:83 msgid "Work Email" msgstr "Email Travail" -#: external/templates/verify/verify-family-info.php:77 +#: external/templates/verify/verify-family-info.php:87 msgid "Age Hidden" msgstr "Age masqué" +<<<<<<< HEAD #: external/templates/verify/verify-family-info.php:126 msgid "Please let us know what information to update if any" msgstr "Faîtes nous part des informations éventuelles à mettre à jour" @@ -8155,6 +8837,41 @@ msgid "PDF Report" msgstr "Rapport PDF" #: FamilyView.php:935 +======= +#: external/templates/verify/verify-family-info.php:136 +msgid "Please let us know what information to update if any" +msgstr "Faîtes nous part des informations éventuelles à mettre à jour" + +#: external/templates/verify/verify-family-info.php:141 +msgid "Your verification request is complete" +msgstr "La requête de vérification est terminée" + +#: external/templates/verify/verify-family-info.php:145 +msgid "We encountered an error submitting with your verification data" +msgstr "Nous rencontrons une erreur pour vérifier vos données" + +#: external/templates/verify/verify-family-info.php:151 +msgid "Visit our Site" +msgstr "Visiter notre site" + +#: FamilyView.php:923 +msgid "Request Family Info Verification" +msgstr "Reqêtes de vérification des infos famille" + +#: FamilyView.php:926 +msgid "Select how do you want to request the family information to be verified" +msgstr "Sélectionner la manière de faire la demande de vérification des informations de famille" + +#: FamilyView.php:947 +msgid "Online Verification" +msgstr "Vérification en ligne" + +#: FamilyView.php:952 +msgid "PDF Report" +msgstr "Rapport PDF" + +#: FamilyView.php:954 +>>>>>>> master msgid "Verified In Person" msgstr "Vérifier En personne" @@ -8350,7 +9067,11 @@ msgstr "Désactiver la famille." msgid "Activated the Family" msgstr "Activer la famille." +<<<<<<< HEAD #: CartView.php:280 Include/Functions.php:121 +======= +#: CartView.php:287 Include/Functions.php:121 +>>>>>>> master msgid "families" msgstr "Familles" @@ -8358,6 +9079,7 @@ msgstr "Familles" msgid "Deposit ticket type. QBDT - Quickbooks" msgstr "Type de tiques de dépôt. QBDT - quickbooks" +<<<<<<< HEAD #: ChurchCRM/dto/SystemConfig.php:220 msgid "Financial Settings" msgstr "Réglages financier" @@ -8368,6 +9090,18 @@ msgid "An invalid configuration name has been requested" msgstr "Un nom de configuration invalide a été retourné" #: ChurchCRM/dto/SystemConfig.php:317 +======= +#: ChurchCRM/dto/SystemConfig.php:221 +msgid "Financial Settings" +msgstr "Réglages financier" + +#: ChurchCRM/dto/SystemConfig.php:275 ChurchCRM/dto/SystemConfig.php:287 +#: ChurchCRM/dto/SystemConfig.php:300 +msgid "An invalid configuration name has been requested" +msgstr "Un nom de configuration invalide a été retourné" + +#: ChurchCRM/dto/SystemConfig.php:318 +>>>>>>> master msgid "An invalid configuration id has been requested" msgstr "Un id de configuration invalide a été retourné" @@ -8388,6 +9122,7 @@ msgstr "Vérifiez SVP que c'est ce que vous voulez faire.

    " msgid " This Family is Deactivated" msgstr " Cette famille est désactivée" +<<<<<<< HEAD #: FamilyView.php:343 msgid " this Family" msgstr " cette famille" @@ -8405,6 +9140,25 @@ msgid "Please confirm deactivation of family" msgstr "Confirmer la désactivation de la famille." #: FamilyView.php:972 +======= +#: FamilyView.php:349 +msgid " this Family" +msgstr " cette famille" + +#: FamilyView.php:988 +msgid "Confirm Deactivation" +msgstr "Confirmer Désactivation" + +#: FamilyView.php:988 +msgid "Confirm Activation" +msgstr "Confirmer l'activation" + +#: FamilyView.php:990 +msgid "Please confirm deactivation of family" +msgstr "Confirmer la désactivation de la famille." + +#: FamilyView.php:993 +>>>>>>> master msgid "Please confirm activation of family" msgstr "Confirmer l'activation de la famille" @@ -8436,7 +9190,11 @@ msgstr "Retirer du panier." msgid "Family Member" msgstr "Membre De Famille" +<<<<<<< HEAD #: FamilyView.php:606 PersonView.php:696 QueryView.php:322 +======= +#: FamilyView.php:619 PersonView.php:696 QueryView.php:322 +>>>>>>> master msgid "select an option" msgstr "Sélectionner Option" @@ -8562,11 +9320,19 @@ msgstr "Compte dévérouillé" msgid "Part" msgstr "Partie" +<<<<<<< HEAD #: FamilyView.php:193 PersonView.php:194 msgid "View Photo" msgstr "Voir Photo" #: FamilyView.php:1026 +======= +#: FamilyView.php:195 PersonView.php:194 +msgid "View Photo" +msgstr "Voir Photo" + +#: FamilyView.php:1046 +>>>>>>> master msgid "Family Photo" msgstr "Photo Famille" @@ -8614,7 +9380,11 @@ msgstr "Légende" msgid "assigned" msgstr "Aissigné" +<<<<<<< HEAD #: PersonView.php:990 +======= +#: PersonView.php:984 +>>>>>>> master msgid "Photo" msgstr "Photo" @@ -8634,6 +9404,7 @@ msgstr "Visualiser les étudiants dont l'anniversaire est dans" msgid "Actions" msgstr "Actions" +<<<<<<< HEAD #: UserList.php:140 UserList.php:161 msgid "Action Confirmation" msgstr "Action confirmée" @@ -8646,6 +9417,28 @@ msgstr "Confirmez-vous remise à zéro compteur échec de Login" msgid "Password reset for" msgstr "Mot de passe à remettre à zéro pour" +======= +#: UserList.php:143 UserList.php:164 +msgid "Action Confirmation" +msgstr "Action confirmée" + +#: UserList.php:145 +msgid "Please confirm reset failed login count" +msgstr "Confirmez-vous remise à zéro compteur échec de Login" + +#: UserList.php:176 +msgid "Password reset for" +msgstr "Mot de passe à remettre à zéro pour" + +#: menuconfig_mcf.php:9 +msgid "View Active Families" +msgstr "Visualiser les familles actives" + +#: menuconfig_mcf.php:10 +msgid "View Inactive Families" +msgstr "Visualiser les familles inactives" + +>>>>>>> master #: ChurchCRM/dto/SystemConfig.php:101 msgid "SMTP Server timeout in sec" msgstr "Timeout en sec. Serveur SMTP" @@ -8732,7 +9525,11 @@ msgstr "Familles manquantes ? Mise à jour Latitude et Longitude pour la famille #: UpdateAllLatLon.php:37 msgid "Families without Geo Info" +<<<<<<< HEAD msgstr "Familles sans Info Géographique " +======= +msgstr "Familles sans Info Géographique" +>>>>>>> master #: ChurchCRM/dto/Notification.php:80 msgid "Notification for" @@ -8838,11 +9635,19 @@ msgstr "KioskVisibilityTimestamp" msgid "Show/Hide Lost Password Link on the login screen" msgstr "Afficher/Masquer Le mot de passe perdu sur fenêtre de login" +<<<<<<< HEAD #: ChurchCRM/dto/SystemConfig.php:222 msgid "Backup" msgstr "Sauvegarde" #: ChurchCRM/dto/SystemConfig.php:224 +======= +#: ChurchCRM/dto/SystemConfig.php:223 +msgid "Backup" +msgstr "Sauvegarde" + +#: ChurchCRM/dto/SystemConfig.php:225 +>>>>>>> master msgid "Integration" msgstr "Intégration" @@ -8942,7 +9747,11 @@ msgstr "Activer enregistrement nouveaux kiosques" msgid "Active Kiosks" msgstr "Kiosques actifs" +<<<<<<< HEAD #: Login.php:192 +======= +#: Login.php:190 +>>>>>>> master msgid "I forgot my password" msgstr "Mot de passe oublié" @@ -8950,6 +9759,7 @@ msgstr "Mot de passe oublié" msgid "Attendees Checked In" msgstr "Valider Participants" +<<<<<<< HEAD #: ChurchCRM/dto/Notification.php:80 msgid "Notification for" msgstr "Notification pour" @@ -9165,4 +9975,49 @@ msgstr "Mot de passe oublié" #: Menu.php:155 msgid "Attendees Checked In" msgstr "Valider Participants" +======= +#: AutoPaymentEditor.php:133 +msgid " family" +msgstr " Famille" + +#: AutoPaymentEditor.php:832 +msgid "Bank Draft " +msgstr "Bank Draft " + +#: AutoPaymentEditor.php:836 +msgid "Credit Card " +msgstr "Carte de crédit " + +#: AutoPaymentEditor.php:840 +msgid "Disable " +msgstr "désactiver " + +#: AutoPaymentEditor.php:1018 +msgid "Store Private Data at Vanco" +msgstr "Store Private Data at Vanco" + +#: CartView.php:106 +msgid "Cart Functions" +msgstr "Fonctions du Panier" + +#: CartView.php:195 +msgid "Text Cart" +msgstr "Texto du Panier" + +#: ChurchCRM/dto/SystemConfig.php:208 +msgid "Your Church's Website" +msgstr "Votre site église" + +#: ChurchCRM/Service/TimelineService.php:118 +msgid "Self Verification" +msgstr "Autovérification" + +#: FamilyView.php:349 +msgid "Deactivate" +msgstr "Désactiver" + +#: FamilyView.php:349 +msgid "Activate" +msgstr "Activer" +>>>>>>> master diff --git a/src/locale/hu_HU/LC_MESSAGES/messages.po b/src/locale/hu_HU/LC_MESSAGES/messages.po index 5b0356e323..7c446bcac2 100644 --- a/src/locale/hu_HU/LC_MESSAGES/messages.po +++ b/src/locale/hu_HU/LC_MESSAGES/messages.po @@ -21,8 +21,13 @@ msgstr "Törlés megerősítése Automatikus fizetés" #: DonationFundEditor.php:186 EditEventAttendees.php:76 #: ElectronicPaymentList.php:222 ElectronicPaymentList.php:288 #: EventNames.php:305 FamilyCustomFieldsEditor.php:334 +<<<<<<< HEAD #: FamilyCustomFieldsEditor.php:392 FamilyView.php:645 FamilyView.php:697 #: FamilyView.php:755 FamilyView.php:892 FindDepositSlip.php:108 +======= +#: FamilyCustomFieldsEditor.php:392 FamilyView.php:661 FamilyView.php:713 +#: FamilyView.php:772 FamilyView.php:909 FindDepositSlip.php:108 +>>>>>>> master #: FundRaiserEditor.php:204 ListEvents.php:250 PaddleNumList.php:60 #: PersonCustomFieldsEditor.php:318 PersonCustomFieldsEditor.php:387 #: PersonView.php:908 PledgeDelete.php:57 PropertyList.php:69 @@ -31,11 +36,19 @@ msgstr "Törlés megerősítése Automatikus fizetés" msgid "Delete" msgstr "Töröl" +<<<<<<< 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 @@ -43,17 +56,29 @@ msgstr "Töröl" #: 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 "Töröl" +<<<<<<< HEAD #: AutoPaymentEditor.php:131 msgid "Automatic payment configuration for the " msgstr "Automata fizető-konfiguráció" #: AutoPaymentEditor.php:582 CanvassEditor.php:242 DepositSlipEditor.php:98 +======= +#: AutoPaymentEditor.php:133 +msgid "Automatic payment configuration for the " +msgstr "Automata fizető-konfiguráció" + +#: 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 @@ -66,7 +91,11 @@ msgstr "Automata fizető-konfiguráció" msgid "Save" msgstr "Kivéve" +<<<<<<< HEAD #: AutoPaymentEditor.php:599 BatchWinnerEntry.php:87 BatchWinnerEntry.php:99 +======= +#: AutoPaymentEditor.php:808 BatchWinnerEntry.php:87 BatchWinnerEntry.php:99 +>>>>>>> master #: 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 @@ -78,6 +107,7 @@ msgstr "Kivéve" msgid "Unassigned" msgstr "Gazdátlan" +<<<<<<< HEAD #: AutoPaymentEditor.php:619 msgid "Automatic payment type" msgstr "Automatikus fizetés módját" @@ -91,36 +121,71 @@ msgid "Payment interval (months)" msgstr "Fizetési idő (hónap)" #: AutoPaymentEditor.php:657 CartToGroup.php:80 EditEventTypes.php:91 +======= +#: AutoPaymentEditor.php:828 +msgid "Automatic payment type" +msgstr "Automatikus fizetés módját" + +#: AutoPaymentEditor.php:858 +msgid "Payment amount" +msgstr "Fizetési összeg" + +#: AutoPaymentEditor.php:863 +msgid "Payment interval (months)" +msgstr "Fizetési idő (hónap)" + +#: 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 "Egyik sem" +<<<<<<< HEAD #: AutoPaymentEditor.php:670 msgid "inactive" msgstr "tétlen" #: AutoPaymentEditor.php:700 CartToFamily.php:249 CSVExport.php:115 +======= +#: AutoPaymentEditor.php:884 +msgid "inactive" +msgstr "tétlen" + +#: 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 "City" +<<<<<<< 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 "Állami" +<<<<<<< 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 "Ország" +<<<<<<< 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 @@ -128,30 +193,48 @@ msgstr "Ország" msgid "Phone" msgstr "Telefon" +<<<<<<< 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 "Email" +<<<<<<< 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 "Hitelkártya" +<<<<<<< HEAD #: AutoPaymentEditor.php:745 msgid "Expiration Month" msgstr "Lejárati hónap" @@ -169,6 +252,25 @@ msgid "Bank Route Number" msgstr "Bank Route szám" #: AutoPaymentEditor.php:765 +======= +#: AutoPaymentEditor.php:969 +msgid "Expiration Month" +msgstr "Lejárati hónap" + +#: AutoPaymentEditor.php:975 +msgid "Expiration Year" +msgstr "Lejárat éve" + +#: AutoPaymentEditor.php:981 +msgid "Bank Name" +msgstr "Bank neve" + +#: AutoPaymentEditor.php:987 +msgid "Bank Route Number" +msgstr "Bank Route szám" + +#: AutoPaymentEditor.php:993 +>>>>>>> master msgid "Bank Account Number" msgstr "Bankszámlaszám" @@ -229,10 +331,17 @@ msgstr "Adja meg a nyertesek" msgid "CSV Export" msgstr "CSV export" +<<<<<<< HEAD #: AutoPaymentEditor.php:685 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:182 +======= +#: 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 +>>>>>>> master #, fuzzy msgid "Last Name" msgstr "Vezetéknév" @@ -274,7 +383,11 @@ msgstr "Születési / Anniversary Dátum" msgid "Age / Years Married" msgstr "Életkor / Évek Házas" +<<<<<<< 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 #, fuzzy msgid "Family Role" @@ -420,9 +533,15 @@ msgstr "Adomány boríték" #: 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 @@ -432,8 +551,13 @@ msgid "Home Phone" msgstr "Otthoni telefon" #: 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 @@ -441,8 +565,13 @@ msgid "Work Phone" msgstr "Munka Phone" #: 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" @@ -454,13 +583,22 @@ msgstr "Munka / Egyéb Email" #: 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 "Születési dátum" #: 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 "Wedding Date" @@ -492,7 +630,11 @@ msgstr "Megjegyzés: Elválasztók (gondolatjelek, stb), vagy annak hiánya nem msgid "Default country if none specified otherwise" msgstr "Alapértelmezett ország, ha nincs másként nem" +<<<<<<< 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" @@ -687,11 +829,19 @@ msgstr "Nincs családja beírt név!" msgid "Add Cart to Family" msgstr "Add kosárba Family" +<<<<<<< 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 #: EventNames.php:266 FamilyCustomFieldsEditor.php:330 #: FamilyCustomFieldsEditor.php:444 FamilyList.php:43 FamilyView.php:535 +======= +#: 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:330 +#: FamilyCustomFieldsEditor.php:444 FamilyList.php:43 FamilyView.php:548 +>>>>>>> master #: GeoPage.php:385 GroupEditor.php:77 GroupPropsFormEditor.php:284 #: GroupPropsFormEditor.php:396 GroupView.php:321 GroupView.php:355 #: PersonCustomFieldsEditor.php:314 PersonCustomFieldsEditor.php:445 @@ -773,19 +923,27 @@ msgstr "Add hozzá a Csoport" msgid "Create a New Group" msgstr "Új csoport létrehozása" -#: CartView.php:42 +#: CartView.php:41 msgid "View Your Cart" msgstr "Mind Ön kosara" -#: CartView.php:50 +#: CartView.php:49 msgid "You have no items in your cart." msgstr "Nincsenek termékek a kosárban." +<<<<<<< HEAD #: CartView.php:59 msgid "Back to Menu" msgstr "Vissza a Menu" #: CartView.php:94 +======= +#: CartView.php:58 +msgid "Back to Menu" +msgstr "Vissza a Menu" + +#: CartView.php:93 +>>>>>>> master msgid "Go To Labels" msgstr "Go To címkék" @@ -793,6 +951,7 @@ msgstr "Go To címkék" msgid "Empty Cart" msgstr "Üres Kosár" +<<<<<<< HEAD #: CartView.php:113 Include/Header.php:131 msgid "Empty Cart to Group" msgstr "Üres Kosár csoporthoz" @@ -802,6 +961,17 @@ msgid "Empty Cart to Family" msgstr "Üres a kosár Család" #: CartView.php:121 Include/Header.php:141 +======= +#: CartView.php:114 Include/Header.php:131 +msgid "Empty Cart to Group" +msgstr "Üres Kosár csoporthoz" + +#: CartView.php:120 Include/Header.php:136 +msgid "Empty Cart to Family" +msgstr "Üres a kosár Család" + +#: CartView.php:124 Include/Header.php:141 +>>>>>>> master msgid "Empty Cart to Event" msgstr "Üres Cart a rendezvény" @@ -809,7 +979,11 @@ msgstr "Üres Cart a rendezvény" msgid "Map Cart" msgstr "Térkép Cart" +<<<<<<< HEAD #: CartView.php:129 +======= +#: CartView.php:135 +>>>>>>> master msgid "Name Tags" msgstr "Név Szavak" @@ -817,11 +991,16 @@ msgstr "Név Szavak" msgid "Email Cart" msgstr "Email Cart" +<<<<<<< HEAD #: CartView.php:164 GroupView.php:205 +======= +#: CartView.php:170 GroupView.php:205 +>>>>>>> master #: sundayschool/SundaySchoolClassView.php:100 msgid "Email (BCC)" msgstr "Email (BCC)" +<<<<<<< HEAD #: CartView.php:193 msgid "Create Directory From Cart" msgstr "Hozzon létre Directory kezdőár kosárba" @@ -848,17 +1027,53 @@ msgstr "személyek" #: 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:200 +msgid "Create Directory From Cart" +msgstr "Hozzon létre Directory kezdőár kosárba" + +#: CartView.php:224 CartView.php:266 +msgid "Generate Labels" +msgstr "Generálása címkék" + +#: CartView.php:232 +msgid "Bulk Mail Presort" +msgstr "Bulk Mail Presort" + +#: CartView.php:241 +msgid "Quiet Presort" +msgstr "Csendes Presort" + +#: CartView.php:287 +msgid "Your cart contains" +msgstr "Kosarában" + +#: CartView.php:287 +msgid "persons from" +msgstr "személyek" + +#: 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 "Eltávolít" +<<<<<<< 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 "Igen" +<<<<<<< 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" @@ -877,7 +1092,11 @@ msgstr "Válassza ki az eseményt, amelyre szeretné, hogy ellenőrizze az ember msgid "Select Event" msgstr "Válassza Event" +<<<<<<< HEAD #: external/templates/verify/verify-family-info.php:140 +======= +#: external/templates/verify/verify-family-info.php:150 +>>>>>>> master msgid "Verify" msgstr "Ellenőrzése" @@ -918,16 +1137,28 @@ msgstr "Akció" msgid "No Attendees Assigned to Event" msgstr "Nem Résztvevők Hozzárendelve Event" +<<<<<<< HEAD #: Checkin.php:480 Include/Functions.php:1658 Reports/CanvassReports.php:245 +======= +#: Checkin.php:472 Include/Functions.php:1658 Reports/CanvassReports.php:245 +>>>>>>> master #: Reports/VotingMembers.php:88 queryparameteroptions_qpo.php:15 msgid "Member" msgstr "Tag" +<<<<<<< HEAD #: Checkin.php:482 ChurchCRM/Service/PersonService.php:38 msgid " of the" msgstr "Az" #: Checkin.php:484 ChurchCRM/Service/PersonService.php:40 PersonView.php:267 +======= +#: Checkin.php:474 ChurchCRM/Service/PersonService.php:38 +msgid " of the" +msgstr "Az" + +#: Checkin.php:476 ChurchCRM/Service/PersonService.php:40 PersonView.php:267 +>>>>>>> master msgid "(No assigned family)" msgstr "(Nincs hozzárendelt család)" @@ -1004,21 +1235,35 @@ msgstr "Milyen szerepet a gyerek?" msgid "Information to Include" msgstr "Információ Beleértve" +<<<<<<< HEAD #: AutoPaymentEditor.php:690 AutoPaymentEditor.php:695 CartToFamily.php:239 #: CartToFamily.php:244 CartView.php:287 CSVExport.php:105 CSVExport.php:110 +======= +#: 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 "Cím" #: 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" @@ -1028,7 +1273,11 @@ msgstr "Születésnap" msgid "Family Home Phone" msgstr "Family Home Phone" +<<<<<<< HEAD #: ChurchCRM/tasks/FamilyWorkPhoneTask.php:30 DirectoryReports.php:181 +======= +#: DirectoryReports.php:181 +>>>>>>> master msgid "Family Work Phone" msgstr "Családi Munkahelyi telefon" @@ -1037,7 +1286,11 @@ msgid "Family Cell Phone" msgstr "Family Cell Phone" #: 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 "Family Email" @@ -1224,11 +1477,19 @@ msgstr "Recurrance Pattern" msgid "Attendance Counts" msgstr "Részvétel számít" +<<<<<<< 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 @@ -1237,7 +1498,11 @@ msgid "Family" msgstr "Család" #: ElectronicPaymentList.php:199 FamilyCustomFieldsEditor.php:329 +<<<<<<< HEAD #: FamilyCustomFieldsEditor.php:431 FamilyView.php:534 FamilyView.php:639 +======= +#: FamilyCustomFieldsEditor.php:431 FamilyView.php:547 FamilyView.php:655 +>>>>>>> master #: 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 @@ -1245,19 +1510,32 @@ msgstr "Család" msgid "Type" msgstr "Type" +<<<<<<< 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 "Költségvetési év" +<<<<<<< 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 "Összeg" +<<<<<<< HEAD #: AutoPaymentEditor.php:654 ElectronicPaymentList.php:204 FamilyView.php:643 #: FamilyView.php:746 FinancialReports.php:305 SelectDelete.php:215 +======= +#: AutoPaymentEditor.php:868 ElectronicPaymentList.php:204 FamilyView.php:659 +#: FamilyView.php:763 FinancialReports.php:305 SelectDelete.php:215 +>>>>>>> master msgid "Fund" msgstr "Alap" @@ -1276,8 +1554,13 @@ msgid "Year" msgstr "Év" #: 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 @@ -1542,7 +1825,11 @@ msgid "Custom Fields" msgstr "Egyéni mezők" #: 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 "Családtagok" @@ -1563,7 +1850,11 @@ msgstr "Középső" msgid "Last" msgstr "Utolsó" +<<<<<<< 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" @@ -1646,15 +1937,24 @@ msgstr "Unk" msgid "Family View" msgstr "Family megnézése" +<<<<<<< HEAD #: FamilyView.php:232 msgid "Latitude/Longitude" msgstr "Latitude / Longitude" #: FamilyEditor.php:881 FamilyView.php:249 ManageEnvelopes.php:170 +======= +#: FamilyView.php:236 +msgid "Latitude/Longitude" +msgstr "Latitude / Longitude" + +#: FamilyEditor.php:881 FamilyView.php:254 ManageEnvelopes.php:170 +>>>>>>> master #: PledgeEditor.php:528 msgid "Envelope Number" msgstr "Boríték száma" +<<<<<<< HEAD #: FamilyView.php:308 msgid "Previous Family" msgstr "Korábbi Family" @@ -1680,24 +1980,64 @@ msgid "No property assignments." msgstr "Nincs ingatlan feladatokat." #: FamilyView.php:536 GroupView.php:356 PersonView.php:655 PrintView.php:451 +======= +#: FamilyView.php:315 +msgid "Previous Family" +msgstr "Korábbi Family" + +#: FamilyView.php:323 +msgid "Next Family" +msgstr "Következő Családi" + +#: FamilyView.php:199 PersonView.php:197 +msgid "Upload Photo" +msgstr "Fotó feltöltése" + +#: FamilyView.php:204 PersonView.php:201 +msgid "Delete Photo" +msgstr "Törlés Photo" + +#: FamilyView.php:455 +msgid "Pledges and Payments" +msgstr "Felajánlások és kifizetések" + +#: FamilyView.php:540 PersonView.php:647 PrintView.php:446 +msgid "No property assignments." +msgstr "Nincs ingatlan feladatokat." + +#: FamilyView.php:549 GroupView.php:356 PersonView.php:655 PrintView.php:451 +>>>>>>> master #: PropertyAssign.php:180 SystemSettings.php:152 msgid "Value" msgstr "Érték" +<<<<<<< HEAD #: FamilyView.php:539 FamilyView.php:577 GroupView.php:359 GroupView.php:395 msgid "Edit Value" msgstr "Érték szerkesztése" #: FamilyView.php:600 PersonView.php:688 +======= +#: FamilyView.php:552 FamilyView.php:590 GroupView.php:359 GroupView.php:395 +msgid "Edit Value" +msgstr "Érték szerkesztése" + +#: FamilyView.php:613 PersonView.php:688 +>>>>>>> master #, fuzzy msgid "Assign a New Property" msgstr "Rendelni egy új tulajdon" +<<<<<<< HEAD #: FamilyView.php:618 GroupView.php:433 PersonView.php:724 PersonView.php:810 +======= +#: FamilyView.php:634 GroupView.php:433 PersonView.php:724 PersonView.php:810 +>>>>>>> master #: PropertyAssign.php:189 SelectList.php:1081 msgid "Assign" msgstr "Kijelöl" +<<<<<<< HEAD #: FamilyView.php:640 msgid "Next payment date" msgstr "Next fizetési határidő" @@ -1736,11 +2076,52 @@ msgstr "Pledge vagy fizetés" #: AutoPaymentEditor.php:632 CanvassEditor.php:198 DepositSlipEditor.php:82 #: EditEventAttendees.php:33 FamilyView.php:748 FindFundRaiser.php:241 +======= +#: FamilyView.php:656 +msgid "Next payment date" +msgstr "Next fizetési határidő" + +#: FamilyView.php:658 +msgid "Interval (months)" +msgstr "Interval (hónap)" + +#: FamilyView.php:662 FamilyView.php:773 SelectDelete.php:222 +msgid "Date Updated" +msgstr "Módosítás dátuma" + +#: FamilyView.php:663 FamilyView.php:774 SelectDelete.php:223 +msgid "Updated By" +msgstr "Frissítve: By" + +#: FamilyView.php:729 +msgid "Add a new automatic payment" +msgstr "Új automatikus fizetés" + +#: FamilyView.php:741 +msgid "Show Pledges" +msgstr "Megjelenítés vállalja" + +#: FamilyView.php:745 +msgid "Show Payments" +msgstr "Megjelenítés kifizetések" + +#: FamilyView.php:754 MemberRoleChange.php:120 PropertyAssign.php:191 +msgid "Update" +msgstr "Frissítse" + +#: FamilyView.php:762 +msgid "Pledge or Payment" +msgstr "Pledge vagy fizetés" + +#: 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 "Dátum" +<<<<<<< HEAD #: FamilyView.php:750 msgid "NonDeductible" msgstr "NonDeductible" @@ -1770,6 +2151,37 @@ msgid " Canvass Entry" msgstr "Korteskedés bejegyzés" #: DepositSlipEditor.php:223 FamilyView.php:880 FindDepositSlip.php:98 +======= +#: FamilyView.php:767 +msgid "NonDeductible" +msgstr "NonDeductible" + +#: FamilyView.php:768 SelectDelete.php:219 +msgid "Schedule" +msgstr "Menetrend" + +#: FamilyView.php:769 SelectDelete.php:220 +msgid "Method" +msgstr "Módszer" + +#: FamilyView.php:770 PledgeEditor.php:725 SelectDelete.php:221 +msgid "Comment" +msgstr "Megjegyzés" + +#: FamilyView.php:862 +msgid "Add a new pledge" +msgstr "Új fogadalmat" + +#: FamilyView.php:864 +msgid "Add a new payment" +msgstr "Új fizetési" + +#: FamilyView.php:875 +msgid " Canvass Entry" +msgstr "Korteskedés bejegyzés" + +#: DepositSlipEditor.php:223 FamilyView.php:897 FindDepositSlip.php:98 +>>>>>>> master #: PersonView.php:897 PledgeDelete.php:23 msgid "Confirm Delete" msgstr "Törlés megerősítése" @@ -2343,7 +2755,11 @@ msgstr "Group-specifikus tulajdonságok" msgid "Disabled for this group." msgstr "Tiltott ebben a csoportban." +<<<<<<< HEAD #: FamilyView.php:438 GroupView.php:342 PersonView.php:382 PrintView.php:435 +======= +#: FamilyView.php:449 GroupView.php:342 PersonView.php:382 PrintView.php:435 +>>>>>>> master #, fuzzy msgid "Assigned Properties" msgstr "Célhoz Tulajdonságok" @@ -2405,6 +2821,7 @@ msgstr "Érvénytelen login vagy jelszó" msgid "Too many failed logins: your account has been locked. Please contact an administrator." msgstr "Túl sok sikertelen bejelentkezési: fiókját zárolták. Kérjük, forduljon a rendszergazda." +<<<<<<< HEAD #: Login.php:162 msgid "Please Login" msgstr "Kérem, jelentkezzen" @@ -2414,6 +2831,17 @@ msgid "Password" msgstr "Jelszó" #: Login.php:150 Login.php:207 +======= +#: Login.php:159 +msgid "Please Login" +msgstr "Kérem, jelentkezzen" + +#: BackupDatabase.php:76 Login.php:184 UserList.php:56 +msgid "Password" +msgstr "Jelszó" + +#: Login.php:147 Login.php:198 +>>>>>>> master msgid "Login" msgstr "Bejelentkezés" @@ -2425,8 +2853,13 @@ msgstr "Boríték menedzser" msgid "Update Family Records" msgstr "Frissítse Family Records" +<<<<<<< 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 "Még" @@ -2495,7 +2928,11 @@ msgid "US Address Verification Report" msgstr "USA Address Verification Report" #: 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" @@ -2840,7 +3277,11 @@ msgstr "Nyomtatási nézet" #: PrintView.php:325 Reports/CanvassReports.php:244 #: sundayschool/SundaySchoolClassView.php:201 +<<<<<<< HEAD #: sundayschool/SundaySchoolDashboard.php:184 +======= +#: sundayschool/SundaySchoolDashboard.php:196 +>>>>>>> master msgid "Age" msgstr "Életkor" @@ -2861,7 +3302,7 @@ msgstr "Megjegyzések:" msgid "Entered:" msgstr "Bejegyezte:" -#: ChurchCRM/Service/TimelineService.php:124 PrintView.php:484 +#: ChurchCRM/Service/TimelineService.php:126 PrintView.php:484 msgid "by" msgstr "által" @@ -2971,8 +3412,13 @@ msgid "Add a New Property Type" msgstr "Hozzáadása Új Ingatlan típusa" #: 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 "Osztály" @@ -3166,7 +3612,11 @@ msgstr "Törlés Family Record és a családtagok" msgid "Person Listing" msgstr "Személy Listing" +<<<<<<< HEAD #: SelectList.php:184 menuconfig_mcf.php:12 +======= +#: SelectList.php:184 menuconfig_mcf.php:13 +>>>>>>> master msgid "Group Assignment Helper" msgstr "Csoportos Megbízás Helper" @@ -3278,11 +3728,19 @@ msgstr "Naptári év" msgid "US Address Verification" msgstr "USA Address Verification" +<<<<<<< HEAD #: UserList.php:118 msgid "User Delete Confirmation" msgstr "Felhasználó törlése megerősítése" #: UserList.php:120 +======= +#: UserList.php:121 +msgid "User Delete Confirmation" +msgstr "Felhasználó törlése megerősítése" + +#: UserList.php:123 +>>>>>>> master msgid "Please confirm removal of user status from:" msgstr "Kérjük, erősítse eltávolítása felhasználói státuszát:" @@ -3450,7 +3908,11 @@ msgstr "Új jelszó" msgid "Confirm New Password" msgstr "Új jelszó megerősítése" +<<<<<<< HEAD #: UserList.php:163 +======= +#: UserList.php:166 +>>>>>>> master #, fuzzy msgid "Please confirm the password reset of this user" msgstr "Kérjük, erősítse meg a jelszó-visszaállítási ennek a felhasználónak" @@ -3783,8 +4245,13 @@ msgstr "Kapcsolat" msgid "City, State, Zip" msgstr "Város, Állam, Zip" +<<<<<<< HEAD #: 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:40 FamilyEditor.php:787 +#: FamilyView.php:241 Reports/ConfirmReportEmail.php:144 +>>>>>>> master #: Reports/ConfirmReport.php:145 msgid "Send Newsletter" msgstr "Küldés Hírlevél" diff --git a/src/locale/it_IT/LC_MESSAGES/messages.po b/src/locale/it_IT/LC_MESSAGES/messages.po index 275ab96112..8caaa2bf4c 100644 --- a/src/locale/it_IT/LC_MESSAGES/messages.po +++ b/src/locale/it_IT/LC_MESSAGES/messages.po @@ -21,8 +21,13 @@ msgstr "Conferma eliminazione di pagamento automatico" #: DonationFundEditor.php:186 EditEventAttendees.php:76 #: ElectronicPaymentList.php:222 ElectronicPaymentList.php:288 #: EventNames.php:305 FamilyCustomFieldsEditor.php:334 +<<<<<<< HEAD #: FamilyCustomFieldsEditor.php:392 FamilyView.php:645 FamilyView.php:697 #: FamilyView.php:755 FamilyView.php:892 FindDepositSlip.php:108 +======= +#: FamilyCustomFieldsEditor.php:392 FamilyView.php:661 FamilyView.php:713 +#: FamilyView.php:772 FamilyView.php:909 FindDepositSlip.php:108 +>>>>>>> master #: FundRaiserEditor.php:204 ListEvents.php:250 PaddleNumList.php:60 #: PersonCustomFieldsEditor.php:318 PersonCustomFieldsEditor.php:387 #: PersonView.php:908 PledgeDelete.php:57 PropertyList.php:69 @@ -31,11 +36,19 @@ msgstr "Conferma eliminazione di pagamento automatico" msgid "Delete" msgstr "Elimina" +<<<<<<< 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 @@ -43,17 +56,29 @@ msgstr "Elimina" #: 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 "Annulla" +<<<<<<< HEAD #: AutoPaymentEditor.php:131 msgid "Automatic payment configuration for the " msgstr "Configurazione automatica di pagamento per la" #: AutoPaymentEditor.php:582 CanvassEditor.php:242 DepositSlipEditor.php:98 +======= +#: AutoPaymentEditor.php:133 +msgid "Automatic payment configuration for the " +msgstr "Configurazione automatica di pagamento per la" + +#: 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 @@ -66,7 +91,11 @@ msgstr "Configurazione automatica di pagamento per la" msgid "Save" msgstr "Salva" +<<<<<<< HEAD #: AutoPaymentEditor.php:599 BatchWinnerEntry.php:87 BatchWinnerEntry.php:99 +======= +#: AutoPaymentEditor.php:808 BatchWinnerEntry.php:87 BatchWinnerEntry.php:99 +>>>>>>> master #: 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 @@ -78,11 +107,16 @@ msgstr "Salva" msgid "Unassigned" msgstr "Non assegnato" +<<<<<<< HEAD #: AutoPaymentEditor.php:619 +======= +#: AutoPaymentEditor.php:828 +>>>>>>> master #, fuzzy msgid "Automatic payment type" msgstr "Devi selezionare una forma di pagamento" +<<<<<<< HEAD #: AutoPaymentEditor.php:644 msgid "Payment amount" msgstr "Importo del pagamento" @@ -92,36 +126,67 @@ msgid "Payment interval (months)" msgstr "Pagamento intervallo (mesi)" #: AutoPaymentEditor.php:657 CartToGroup.php:80 EditEventTypes.php:91 +======= +#: AutoPaymentEditor.php:858 +msgid "Payment amount" +msgstr "Importo del pagamento" + +#: AutoPaymentEditor.php:863 +msgid "Payment interval (months)" +msgstr "Pagamento intervallo (mesi)" + +#: 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 "Nessuno" +<<<<<<< HEAD #: AutoPaymentEditor.php:670 msgid "inactive" msgstr "inattivo" #: AutoPaymentEditor.php:700 CartToFamily.php:249 CSVExport.php:115 +======= +#: AutoPaymentEditor.php:884 +msgid "inactive" +msgstr "inattivo" + +#: 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 "Città" +<<<<<<< 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 "Provincia" +<<<<<<< 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 "Nazione" +<<<<<<< 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 @@ -129,51 +194,88 @@ msgstr "Nazione" msgid "Phone" msgstr "Telefono" +<<<<<<< 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 "Email" +<<<<<<< HEAD #: AutoPaymentEditor.php:730 ElectronicPaymentList.php:213 +======= +#: AutoPaymentEditor.php:952 ElectronicPaymentList.php:213 +>>>>>>> master #: FinancialReports.php:267 FindDepositSlip.php:52 PledgeEditor.php:592 #, fuzzy msgid "Credit Card" msgstr "Crea vCard" +<<<<<<< HEAD #: AutoPaymentEditor.php:745 msgid "Expiration Month" msgstr "Mese di scadenza" #: AutoPaymentEditor.php:750 +======= +#: AutoPaymentEditor.php:969 +msgid "Expiration Month" +msgstr "Mese di scadenza" + +#: AutoPaymentEditor.php:975 +>>>>>>> master #, fuzzy msgid "Expiration Year" msgstr "Anno di nascita:" +<<<<<<< HEAD #: AutoPaymentEditor.php:755 +======= +#: AutoPaymentEditor.php:981 +>>>>>>> master #, fuzzy msgid "Bank Name" msgstr "Per nome" +<<<<<<< HEAD #: AutoPaymentEditor.php:760 +======= +#: AutoPaymentEditor.php:987 +>>>>>>> master #, fuzzy msgid "Bank Route Number" msgstr "Numero di telefono" +<<<<<<< HEAD #: AutoPaymentEditor.php:765 +======= +#: AutoPaymentEditor.php:993 +>>>>>>> master msgid "Bank Account Number" msgstr "Numero del conto bancario" @@ -242,10 +344,17 @@ msgstr "Inserisci vincitori" msgid "CSV Export" msgstr "Esporta su foglio di calcolo" +<<<<<<< HEAD #: AutoPaymentEditor.php:685 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:182 +======= +#: 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 +>>>>>>> master #, fuzzy msgid "Last Name" msgstr "Cognome" @@ -254,10 +363,17 @@ msgstr "Cognome" msgid "Required" msgstr "Richiesto" +<<<<<<< HEAD #: AutoPaymentEditor.php:680 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:181 +======= +#: 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 +>>>>>>> master #, fuzzy msgid "First Name" msgstr "Nome" @@ -267,7 +383,11 @@ msgstr "Nome" msgid "Middle Name" msgstr "Secondo nome" +<<<<<<< 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 @@ -304,7 +424,11 @@ msgstr "Data compleanno / anniversario" msgid "Age / Years Married" msgstr "Età / Anni di matrimonio" +<<<<<<< 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 #, fuzzy msgid "Family Role" @@ -452,9 +576,15 @@ msgstr "Numero progressivo per le donazioni" #: 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 @@ -464,8 +594,13 @@ msgid "Home Phone" msgstr "Telefono di casa" #: 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 @@ -473,8 +608,13 @@ msgid "Work Phone" msgstr "Telefono di ufficio" #: 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" @@ -486,13 +626,22 @@ msgstr "Ufficio / Altra email" #: 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 "Data di nascita" #: 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 "Data matrimonio:" @@ -525,7 +674,11 @@ msgstr "NOTA: i separatori (trattini, ecc.) o la loro mancanza non sono consider msgid "Default country if none specified otherwise" msgstr "La nazione predefinita è nulla se non specificato altrimenti" +<<<<<<< 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" @@ -734,11 +887,19 @@ msgstr "Nessuna famiglia inserita!" msgid "Add Cart to Family" msgstr "Aggiungi il contenitore alla famiglia" +<<<<<<< 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 #: EventNames.php:266 FamilyCustomFieldsEditor.php:330 #: FamilyCustomFieldsEditor.php:444 FamilyList.php:43 FamilyView.php:535 +======= +#: 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:330 +#: FamilyCustomFieldsEditor.php:444 FamilyList.php:43 FamilyView.php:548 +>>>>>>> master #: GeoPage.php:385 GroupEditor.php:77 GroupPropsFormEditor.php:284 #: GroupPropsFormEditor.php:396 GroupView.php:321 GroupView.php:355 #: PersonCustomFieldsEditor.php:314 PersonCustomFieldsEditor.php:445 @@ -820,20 +981,28 @@ msgstr "Aggiungi al gruppo" msgid "Create a New Group" msgstr "Crea un nuovo gruppo" -#: CartView.php:42 +#: CartView.php:41 msgid "View Your Cart" msgstr "Visualizza il contenitore" -#: CartView.php:50 +#: CartView.php:49 msgid "You have no items in your cart." msgstr "Non hai elementi nel contenitore." +<<<<<<< HEAD #: CartView.php:59 +======= +#: CartView.php:58 +>>>>>>> master #, fuzzy msgid "Back to Menu" msgstr "Torna alla scheda personale" +<<<<<<< HEAD #: CartView.php:94 +======= +#: CartView.php:93 +>>>>>>> master msgid "Go To Labels" msgstr "Vai a etichette" @@ -841,6 +1010,7 @@ msgstr "Vai a etichette" msgid "Empty Cart" msgstr "Svuota contenitore" +<<<<<<< HEAD #: CartView.php:113 Include/Header.php:131 msgid "Empty Cart to Group" msgstr "Svuota contenitore nel gruppo" @@ -850,6 +1020,17 @@ msgid "Empty Cart to Family" msgstr "Svuota contenitore nella famiglia" #: CartView.php:121 Include/Header.php:141 +======= +#: CartView.php:114 Include/Header.php:131 +msgid "Empty Cart to Group" +msgstr "Svuota contenitore nel gruppo" + +#: CartView.php:120 Include/Header.php:136 +msgid "Empty Cart to Family" +msgstr "Svuota contenitore nella famiglia" + +#: CartView.php:124 Include/Header.php:141 +>>>>>>> master #, fuzzy msgid "Empty Cart to Event" msgstr "Svuota contenitore nel gruppo" @@ -859,7 +1040,11 @@ msgstr "Svuota contenitore nel gruppo" msgid "Map Cart" msgstr "Contenitore" +<<<<<<< HEAD #: CartView.php:129 +======= +#: CartView.php:135 +>>>>>>> master #, fuzzy msgid "Name Tags" msgstr "Nome" @@ -869,17 +1054,26 @@ msgstr "Nome" msgid "Email Cart" msgstr "Email inviata" +<<<<<<< HEAD #: CartView.php:164 GroupView.php:205 +======= +#: CartView.php:170 GroupView.php:205 +>>>>>>> master #: sundayschool/SundaySchoolClassView.php:100 #, fuzzy msgid "Email (BCC)" msgstr "Email" +<<<<<<< HEAD #: CartView.php:193 +======= +#: CartView.php:200 +>>>>>>> master #, fuzzy msgid "Create Directory From Cart" msgstr "Crea directory" +<<<<<<< HEAD #: CartView.php:220 CartView.php:261 msgid "Generate Labels" msgstr "Crea le etichette" @@ -889,33 +1083,65 @@ msgid "Bulk Mail Presort" msgstr "Bulk ordinamento preliminare posta" #: CartView.php:237 +======= +#: CartView.php:224 CartView.php:266 +msgid "Generate Labels" +msgstr "Crea le etichette" + +#: CartView.php:232 +msgid "Bulk Mail Presort" +msgstr "Bulk ordinamento preliminare posta" + +#: CartView.php:241 +>>>>>>> master #, fuzzy msgid "Quiet Presort" msgstr "Directory dei rapporti" +<<<<<<< HEAD #: CartView.php:280 +======= +#: CartView.php:287 +>>>>>>> master #, fuzzy msgid "Your cart contains" msgstr "Il contenitore è vuoto!" +<<<<<<< HEAD #: CartView.php:280 +======= +#: CartView.php:287 +>>>>>>> master #, fuzzy msgid "persons from" msgstr "Persona dal gruppo" +<<<<<<< HEAD #: 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: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 "Rimuovi" +<<<<<<< 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 "Sì" +<<<<<<< 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" @@ -935,7 +1161,11 @@ msgstr "Seleziona il gruppo a cui vorresti aggiungere gli elementi nel contenito msgid "Select Event" msgstr "Seleziona stagione" +<<<<<<< HEAD #: external/templates/verify/verify-family-info.php:140 +======= +#: external/templates/verify/verify-family-info.php:150 +>>>>>>> master msgid "Verify" msgstr "Verificare" @@ -981,16 +1211,28 @@ msgstr "Opzione" msgid "No Attendees Assigned to Event" msgstr "Nessun partecipante assegnati all'evento" +<<<<<<< HEAD #: Checkin.php:480 Include/Functions.php:1658 Reports/CanvassReports.php:245 +======= +#: Checkin.php:472 Include/Functions.php:1658 Reports/CanvassReports.php:245 +>>>>>>> master #: Reports/VotingMembers.php:88 queryparameteroptions_qpo.php:15 msgid "Member" msgstr "Membro" +<<<<<<< HEAD #: Checkin.php:482 ChurchCRM/Service/PersonService.php:38 msgid " of the" msgstr " del" #: Checkin.php:484 ChurchCRM/Service/PersonService.php:40 PersonView.php:267 +======= +#: Checkin.php:474 ChurchCRM/Service/PersonService.php:38 +msgid " of the" +msgstr " del" + +#: Checkin.php:476 ChurchCRM/Service/PersonService.php:40 PersonView.php:267 +>>>>>>> master msgid "(No assigned family)" msgstr "(Nessuna famiglia assegnata)" @@ -1070,21 +1312,35 @@ msgstr "Che ruolo ha un figlio?" msgid "Information to Include" msgstr "Informazioni da includere" +<<<<<<< HEAD #: AutoPaymentEditor.php:690 AutoPaymentEditor.php:695 CartToFamily.php:239 #: CartToFamily.php:244 CartView.php:287 CSVExport.php:105 CSVExport.php:110 +======= +#: 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 "Indirizzo" #: 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" @@ -1094,7 +1350,11 @@ msgstr "Data di nascita:" msgid "Family Home Phone" msgstr "Telefono di casa famigliare" +<<<<<<< HEAD #: ChurchCRM/tasks/FamilyWorkPhoneTask.php:30 DirectoryReports.php:181 +======= +#: DirectoryReports.php:181 +>>>>>>> master msgid "Family Work Phone" msgstr "Telefono di ufficio famigliare" @@ -1103,7 +1363,11 @@ msgid "Family Cell Phone" msgstr "Telefono cellulare famigliare" #: 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 "Email famigliare" @@ -1295,11 +1559,19 @@ msgstr "Ricorrenza modello" msgid "Attendance Counts" msgstr "Presenze Conti" +<<<<<<< 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 @@ -1308,7 +1580,11 @@ msgid "Family" msgstr "Famiglia" #: ElectronicPaymentList.php:199 FamilyCustomFieldsEditor.php:329 +<<<<<<< HEAD #: FamilyCustomFieldsEditor.php:431 FamilyView.php:534 FamilyView.php:639 +======= +#: FamilyCustomFieldsEditor.php:431 FamilyView.php:547 FamilyView.php:655 +>>>>>>> master #: 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 @@ -1316,20 +1592,33 @@ msgstr "Famiglia" msgid "Type" msgstr "Tipo" +<<<<<<< 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 #, fuzzy msgid "Fiscal Year" msgstr "Anno non valido" +<<<<<<< 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 "Cifra" +<<<<<<< HEAD #: AutoPaymentEditor.php:654 ElectronicPaymentList.php:204 FamilyView.php:643 #: FamilyView.php:746 FinancialReports.php:305 SelectDelete.php:215 +======= +#: AutoPaymentEditor.php:868 ElectronicPaymentList.php:204 FamilyView.php:659 +#: FamilyView.php:763 FinancialReports.php:305 SelectDelete.php:215 +>>>>>>> master msgid "Fund" msgstr "Fondo" @@ -1348,8 +1637,13 @@ msgid "Year" msgstr "Anno" #: 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 @@ -1635,7 +1929,11 @@ msgid "Custom Fields" msgstr "Campi personalizzabili" #: 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 "Membri della famiglia" @@ -1656,7 +1954,11 @@ msgstr "Secondo nome" msgid "Last" msgstr "Cognome" +<<<<<<< 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" @@ -1739,16 +2041,25 @@ msgstr "N/D" msgid "Family View" msgstr "Visualizza famiglia" +<<<<<<< HEAD #: FamilyView.php:232 msgid "Latitude/Longitude" msgstr "Latitudine / Longitudine" #: FamilyEditor.php:881 FamilyView.php:249 ManageEnvelopes.php:170 +======= +#: FamilyView.php:236 +msgid "Latitude/Longitude" +msgstr "Latitudine / Longitudine" + +#: FamilyEditor.php:881 FamilyView.php:254 ManageEnvelopes.php:170 +>>>>>>> master #: PledgeEditor.php:528 #, fuzzy msgid "Envelope Number" msgstr "Numero per le donazioni" +<<<<<<< HEAD #: FamilyView.php:308 msgid "Previous Family" msgstr "Famiglia precedente" @@ -1774,24 +2085,64 @@ msgid "No property assignments." msgstr "Nessuna proprietà assegnata." #: FamilyView.php:536 GroupView.php:356 PersonView.php:655 PrintView.php:451 +======= +#: FamilyView.php:315 +msgid "Previous Family" +msgstr "Famiglia precedente" + +#: FamilyView.php:323 +msgid "Next Family" +msgstr "Famiglia successiva" + +#: FamilyView.php:199 PersonView.php:197 +msgid "Upload Photo" +msgstr "Inserisci foto" + +#: FamilyView.php:204 PersonView.php:201 +msgid "Delete Photo" +msgstr "Elimina foto" + +#: FamilyView.php:455 +msgid "Pledges and Payments" +msgstr "Impegni e pagamenti" + +#: FamilyView.php:540 PersonView.php:647 PrintView.php:446 +msgid "No property assignments." +msgstr "Nessuna proprietà assegnata." + +#: FamilyView.php:549 GroupView.php:356 PersonView.php:655 PrintView.php:451 +>>>>>>> master #: PropertyAssign.php:180 SystemSettings.php:152 msgid "Value" msgstr "Valore" +<<<<<<< HEAD #: FamilyView.php:539 FamilyView.php:577 GroupView.php:359 GroupView.php:395 msgid "Edit Value" msgstr "Modifica valore" #: FamilyView.php:600 PersonView.php:688 +======= +#: FamilyView.php:552 FamilyView.php:590 GroupView.php:359 GroupView.php:395 +msgid "Edit Value" +msgstr "Modifica valore" + +#: FamilyView.php:613 PersonView.php:688 +>>>>>>> master #, fuzzy msgid "Assign a New Property" msgstr "Assegna una nuova proprietà" +<<<<<<< HEAD #: FamilyView.php:618 GroupView.php:433 PersonView.php:724 PersonView.php:810 +======= +#: FamilyView.php:634 GroupView.php:433 PersonView.php:724 PersonView.php:810 +>>>>>>> master #: PropertyAssign.php:189 SelectList.php:1081 msgid "Assign" msgstr "Assegna" +<<<<<<< HEAD #: FamilyView.php:640 msgid "Next payment date" msgstr "Data di pagamento successiva" @@ -1801,29 +2152,57 @@ msgid "Interval (months)" msgstr "Intervallo (mesi)" #: FamilyView.php:646 FamilyView.php:756 SelectDelete.php:222 +======= +#: FamilyView.php:656 +msgid "Next payment date" +msgstr "Data di pagamento successiva" + +#: FamilyView.php:658 +msgid "Interval (months)" +msgstr "Intervallo (mesi)" + +#: FamilyView.php:662 FamilyView.php:773 SelectDelete.php:222 +>>>>>>> master #, fuzzy msgid "Date Updated" msgstr "Data inserita" +<<<<<<< HEAD #: FamilyView.php:647 FamilyView.php:757 SelectDelete.php:223 +======= +#: FamilyView.php:663 FamilyView.php:774 SelectDelete.php:223 +>>>>>>> master #, fuzzy msgid "Updated By" msgstr "Aggiorna" +<<<<<<< HEAD #: FamilyView.php:713 +======= +#: FamilyView.php:729 +>>>>>>> master #, fuzzy msgid "Add a new automatic payment" msgstr "Aggiungi una nuova donazione" +<<<<<<< HEAD #: FamilyView.php:725 msgid "Show Pledges" msgstr "Mostra Pegni" #: FamilyView.php:729 +======= +#: FamilyView.php:741 +msgid "Show Pledges" +msgstr "Mostra Pegni" + +#: FamilyView.php:745 +>>>>>>> master #, fuzzy msgid "Show Payments" msgstr "Mostra in" +<<<<<<< HEAD #: FamilyView.php:738 MemberRoleChange.php:120 PropertyAssign.php:191 msgid "Update" msgstr "Aggiorna" @@ -1834,11 +2213,24 @@ msgstr "Pegno o di pagamento" #: AutoPaymentEditor.php:632 CanvassEditor.php:198 DepositSlipEditor.php:82 #: EditEventAttendees.php:33 FamilyView.php:748 FindFundRaiser.php:241 +======= +#: FamilyView.php:754 MemberRoleChange.php:120 PropertyAssign.php:191 +msgid "Update" +msgstr "Aggiorna" + +#: FamilyView.php:762 +msgid "Pledge or Payment" +msgstr "Pegno o di pagamento" + +#: 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 "Data" +<<<<<<< HEAD #: FamilyView.php:750 msgid "NonDeductible" msgstr "Non deducibili" @@ -1848,29 +2240,60 @@ msgid "Schedule" msgstr "Programmare" #: FamilyView.php:752 SelectDelete.php:220 +======= +#: FamilyView.php:767 +msgid "NonDeductible" +msgstr "Non deducibili" + +#: FamilyView.php:768 SelectDelete.php:219 +msgid "Schedule" +msgstr "Programmare" + +#: FamilyView.php:769 SelectDelete.php:220 +>>>>>>> master #, fuzzy msgid "Method" msgstr "Metodo di output:" +<<<<<<< HEAD #: FamilyView.php:753 PledgeEditor.php:725 SelectDelete.php:221 msgid "Comment" msgstr "Commento" #: FamilyView.php:845 +======= +#: FamilyView.php:770 PledgeEditor.php:725 SelectDelete.php:221 +msgid "Comment" +msgstr "Commento" + +#: FamilyView.php:862 +>>>>>>> master #, fuzzy msgid "Add a new pledge" msgstr "Aggiungi nuovo utente" +<<<<<<< HEAD #: FamilyView.php:847 +======= +#: FamilyView.php:864 +>>>>>>> master #, fuzzy msgid "Add a new payment" msgstr "Aggiungi una nuova donazione" +<<<<<<< HEAD #: FamilyView.php:858 msgid " Canvass Entry" msgstr "Canvass Entry" #: DepositSlipEditor.php:223 FamilyView.php:880 FindDepositSlip.php:98 +======= +#: FamilyView.php:875 +msgid " Canvass Entry" +msgstr "Canvass Entry" + +#: DepositSlipEditor.php:223 FamilyView.php:897 FindDepositSlip.php:98 +>>>>>>> master #: PersonView.php:897 PledgeDelete.php:23 #, fuzzy msgid "Confirm Delete" @@ -2482,7 +2905,11 @@ msgstr "Proprietà specifiche del gruppo" msgid "Disabled for this group." msgstr "Disabilitato per questo gruppo." +<<<<<<< HEAD #: FamilyView.php:438 GroupView.php:342 PersonView.php:382 PrintView.php:435 +======= +#: FamilyView.php:449 GroupView.php:342 PersonView.php:382 PrintView.php:435 +>>>>>>> master #, fuzzy msgid "Assigned Properties" msgstr "Proprietà assegnate" @@ -2546,6 +2973,7 @@ msgstr "Password non valida" msgid "Too many failed logins: your account has been locked. Please contact an administrator." msgstr "Troppi login falliti: il tuo account è stato bloccato. Per favore contatta un amministratore." +<<<<<<< HEAD #: Login.php:162 msgid "Please Login" msgstr "Per favore, identificati" @@ -2555,6 +2983,17 @@ msgid "Password" msgstr "Password" #: Login.php:150 Login.php:207 +======= +#: Login.php:159 +msgid "Please Login" +msgstr "Per favore, identificati" + +#: BackupDatabase.php:76 Login.php:184 UserList.php:56 +msgid "Password" +msgstr "Password" + +#: Login.php:147 Login.php:198 +>>>>>>> master msgid "Login" msgstr "Entra" @@ -2568,8 +3007,13 @@ msgstr "Gestione buste per le donazioni" msgid "Update Family Records" msgstr "Aggiungi una nuova famiglia" +<<<<<<< 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 "Conferma" @@ -2641,7 +3085,11 @@ msgid "US Address Verification Report" msgstr "Stati Uniti Indirizzo Rapporto di verifica della" #: 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" @@ -3009,7 +3457,11 @@ msgstr "Visualizzazione stampabile" #: PrintView.php:325 Reports/CanvassReports.php:244 #: sundayschool/SundaySchoolClassView.php:201 +<<<<<<< HEAD #: sundayschool/SundaySchoolDashboard.php:184 +======= +#: sundayschool/SundaySchoolDashboard.php:196 +>>>>>>> master msgid "Age" msgstr "Età" @@ -3030,7 +3482,7 @@ msgstr "Note:" msgid "Entered:" msgstr "Inserita" -#: ChurchCRM/Service/TimelineService.php:124 PrintView.php:484 +#: ChurchCRM/Service/TimelineService.php:126 PrintView.php:484 msgid "by" msgstr "da" @@ -3140,8 +3592,13 @@ msgid "Add a New Property Type" msgstr "Aggiungi un nuovo tipo di proprietà" #: 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 "Classe" @@ -3337,7 +3794,11 @@ msgstr "Elimina la scheda della famiglia E ANCHE i suoi membri" msgid "Person Listing" msgstr "Lista persone" +<<<<<<< HEAD #: SelectList.php:184 menuconfig_mcf.php:12 +======= +#: SelectList.php:184 menuconfig_mcf.php:13 +>>>>>>> master msgid "Group Assignment Helper" msgstr "Assegnazione ai gruppi assistita" @@ -3460,11 +3921,19 @@ msgstr "Anno non valido" msgid "US Address Verification" msgstr "Stati Uniti Indirizzo di verifica" +<<<<<<< HEAD #: UserList.php:118 msgid "User Delete Confirmation" msgstr "Conferma eliminazione utente" #: UserList.php:120 +======= +#: UserList.php:121 +msgid "User Delete Confirmation" +msgstr "Conferma eliminazione utente" + +#: UserList.php:123 +>>>>>>> master msgid "Please confirm removal of user status from:" msgstr "Per favore, conferma l'eliminazione dell'utente da:" @@ -3642,7 +4111,11 @@ msgstr "Nuova password" msgid "Confirm New Password" msgstr "Conferma nuova password" +<<<<<<< HEAD #: UserList.php:163 +======= +#: UserList.php:166 +>>>>>>> master #, fuzzy msgid "Please confirm the password reset of this user" msgstr "Per favore, conferma l'azzeramento della password per questo utente" @@ -3989,8 +4462,13 @@ msgstr "Stagione" msgid "City, State, Zip" msgstr "Città, Provincia CAP" +<<<<<<< HEAD #: 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:40 FamilyEditor.php:787 +#: FamilyView.php:241 Reports/ConfirmReportEmail.php:144 +>>>>>>> master #: Reports/ConfirmReport.php:145 msgid "Send Newsletter" msgstr "Invia Newsletter" diff --git a/src/locale/nb_NO/LC_MESSAGES/messages.po b/src/locale/nb_NO/LC_MESSAGES/messages.po index 6503eda125..aebe55dc14 100644 --- a/src/locale/nb_NO/LC_MESSAGES/messages.po +++ b/src/locale/nb_NO/LC_MESSAGES/messages.po @@ -21,8 +21,13 @@ msgstr "Bekreft sletting Automatisk betaling" #: DonationFundEditor.php:186 EditEventAttendees.php:76 #: ElectronicPaymentList.php:222 ElectronicPaymentList.php:288 #: EventNames.php:305 FamilyCustomFieldsEditor.php:334 +<<<<<<< HEAD #: FamilyCustomFieldsEditor.php:392 FamilyView.php:645 FamilyView.php:697 #: FamilyView.php:755 FamilyView.php:892 FindDepositSlip.php:108 +======= +#: FamilyCustomFieldsEditor.php:392 FamilyView.php:661 FamilyView.php:713 +#: FamilyView.php:772 FamilyView.php:909 FindDepositSlip.php:108 +>>>>>>> master #: FundRaiserEditor.php:204 ListEvents.php:250 PaddleNumList.php:60 #: PersonCustomFieldsEditor.php:318 PersonCustomFieldsEditor.php:387 #: PersonView.php:908 PledgeDelete.php:57 PropertyList.php:69 @@ -31,11 +36,19 @@ msgstr "Bekreft sletting Automatisk betaling" msgid "Delete" msgstr "Slett" +<<<<<<< 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 @@ -43,17 +56,29 @@ msgstr "Slett" #: 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 "Avbryt" +<<<<<<< HEAD #: AutoPaymentEditor.php:131 msgid "Automatic payment configuration for the " msgstr "Automatisk betaling konfigurasjon for" #: AutoPaymentEditor.php:582 CanvassEditor.php:242 DepositSlipEditor.php:98 +======= +#: AutoPaymentEditor.php:133 +msgid "Automatic payment configuration for the " +msgstr "Automatisk betaling konfigurasjon for" + +#: 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 @@ -66,7 +91,11 @@ msgstr "Automatisk betaling konfigurasjon for" msgid "Save" msgstr "Lagre" +<<<<<<< HEAD #: AutoPaymentEditor.php:599 BatchWinnerEntry.php:87 BatchWinnerEntry.php:99 +======= +#: AutoPaymentEditor.php:808 BatchWinnerEntry.php:87 BatchWinnerEntry.php:99 +>>>>>>> master #: 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 @@ -78,6 +107,7 @@ msgstr "Lagre" msgid "Unassigned" msgstr "Unassigned" +<<<<<<< HEAD #: AutoPaymentEditor.php:619 msgid "Automatic payment type" msgstr "Automatisk betaling typen" @@ -91,36 +121,71 @@ msgid "Payment interval (months)" msgstr "Betaling intervall (måneder)" #: AutoPaymentEditor.php:657 CartToGroup.php:80 EditEventTypes.php:91 +======= +#: AutoPaymentEditor.php:828 +msgid "Automatic payment type" +msgstr "Automatisk betaling typen" + +#: AutoPaymentEditor.php:858 +msgid "Payment amount" +msgstr "Betalingsbeløp" + +#: AutoPaymentEditor.php:863 +msgid "Payment interval (months)" +msgstr "Betaling intervall (måneder)" + +#: 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 "Ingen" +<<<<<<< HEAD #: AutoPaymentEditor.php:670 msgid "inactive" msgstr "inaktiv" #: AutoPaymentEditor.php:700 CartToFamily.php:249 CSVExport.php:115 +======= +#: AutoPaymentEditor.php:884 +msgid "inactive" +msgstr "inaktiv" + +#: 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 "By" +<<<<<<< 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 "Stat" +<<<<<<< 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 "Land" +<<<<<<< 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 @@ -128,30 +193,48 @@ msgstr "Land" msgid "Phone" msgstr "Telefon" +<<<<<<< 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 "E-post" +<<<<<<< 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 "Kredittkort" +<<<<<<< HEAD #: AutoPaymentEditor.php:745 msgid "Expiration Month" msgstr "Utløpsmåned" @@ -169,6 +252,25 @@ msgid "Bank Route Number" msgstr "Bank rutenummer" #: AutoPaymentEditor.php:765 +======= +#: AutoPaymentEditor.php:969 +msgid "Expiration Month" +msgstr "Utløpsmåned" + +#: AutoPaymentEditor.php:975 +msgid "Expiration Year" +msgstr "Utløpsår" + +#: AutoPaymentEditor.php:981 +msgid "Bank Name" +msgstr "Banknavn" + +#: AutoPaymentEditor.php:987 +msgid "Bank Route Number" +msgstr "Bank rutenummer" + +#: AutoPaymentEditor.php:993 +>>>>>>> master msgid "Bank Account Number" msgstr "Bankkontonummer" @@ -231,10 +333,17 @@ msgstr "Inn Vinnere" msgid "CSV Export" msgstr "CSV Eksport" +<<<<<<< HEAD #: AutoPaymentEditor.php:685 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:182 +======= +#: 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 +>>>>>>> master #, fuzzy msgid "Last Name" msgstr "Etternavn" @@ -243,10 +352,17 @@ msgstr "Etternavn" msgid "Required" msgstr "Påkrevd" +<<<<<<< HEAD #: AutoPaymentEditor.php:680 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:181 +======= +#: 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 +>>>>>>> master #, fuzzy msgid "First Name" msgstr "Fornavn" @@ -284,7 +400,11 @@ msgstr "Fødsel / Anniversary Dato" msgid "Age / Years Married" msgstr "Alder / år Gift" +<<<<<<< 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 #, fuzzy msgid "Family Role" @@ -430,9 +550,15 @@ msgstr "Donasjon konvolutt" #: 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 @@ -442,8 +568,13 @@ msgid "Home Phone" msgstr "Home Phone" #: 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 @@ -451,8 +582,13 @@ msgid "Work Phone" msgstr "Arbeid Phone" #: 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" @@ -464,13 +600,22 @@ msgstr "Arbeid / Annet Epost" #: 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 "Fødselsdato" #: 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 "Wedding Date" @@ -502,7 +647,11 @@ msgstr "MERK: Separatorer (streker, etc.) eller mangel derav ikke saken" msgid "Default country if none specified otherwise" msgstr "Standardland hvis ingen spesifisert" +<<<<<<< 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" @@ -697,11 +846,19 @@ msgstr "Ingen etternavn angitt!" msgid "Add Cart to Family" msgstr "Legg Cart til Family" +<<<<<<< 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 #: EventNames.php:266 FamilyCustomFieldsEditor.php:330 #: FamilyCustomFieldsEditor.php:444 FamilyList.php:43 FamilyView.php:535 +======= +#: 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:330 +#: FamilyCustomFieldsEditor.php:444 FamilyList.php:43 FamilyView.php:548 +>>>>>>> master #: GeoPage.php:385 GroupEditor.php:77 GroupPropsFormEditor.php:284 #: GroupPropsFormEditor.php:396 GroupView.php:321 GroupView.php:355 #: PersonCustomFieldsEditor.php:314 PersonCustomFieldsEditor.php:445 @@ -783,19 +940,27 @@ msgstr "Legg til i gruppe" msgid "Create a New Group" msgstr "Opprett en ny gruppe" -#: CartView.php:42 +#: CartView.php:41 msgid "View Your Cart" msgstr "Se Kurven din" -#: CartView.php:50 +#: CartView.php:49 msgid "You have no items in your cart." msgstr "Du har ingen varer i handlekurven." +<<<<<<< HEAD #: CartView.php:59 msgid "Back to Menu" msgstr "Tilbake til menyen" #: CartView.php:94 +======= +#: CartView.php:58 +msgid "Back to Menu" +msgstr "Tilbake til menyen" + +#: CartView.php:93 +>>>>>>> master msgid "Go To Labels" msgstr "Gå til etiketter" @@ -803,6 +968,7 @@ msgstr "Gå til etiketter" msgid "Empty Cart" msgstr "Tom Handlekurven" +<<<<<<< HEAD #: CartView.php:113 Include/Header.php:131 msgid "Empty Cart to Group" msgstr "Tom Handlekurven til gruppe" @@ -812,6 +978,17 @@ msgid "Empty Cart to Family" msgstr "Tom Handlekurven til familien" #: CartView.php:121 Include/Header.php:141 +======= +#: CartView.php:114 Include/Header.php:131 +msgid "Empty Cart to Group" +msgstr "Tom Handlekurven til gruppe" + +#: CartView.php:120 Include/Header.php:136 +msgid "Empty Cart to Family" +msgstr "Tom Handlekurven til familien" + +#: CartView.php:124 Include/Header.php:141 +>>>>>>> master msgid "Empty Cart to Event" msgstr "Tom Handlekurven til Event" @@ -819,7 +996,11 @@ msgstr "Tom Handlekurven til Event" msgid "Map Cart" msgstr "Kart Cart" +<<<<<<< HEAD #: CartView.php:129 +======= +#: CartView.php:135 +>>>>>>> master #, fuzzy msgid "Name Tags" msgstr "Navn" @@ -828,11 +1009,16 @@ msgstr "Navn" msgid "Email Cart" msgstr "E Cart" +<<<<<<< HEAD #: CartView.php:164 GroupView.php:205 +======= +#: CartView.php:170 GroupView.php:205 +>>>>>>> master #: sundayschool/SundaySchoolClassView.php:100 msgid "Email (BCC)" msgstr "E-post (BCC)" +<<<<<<< HEAD #: CartView.php:193 msgid "Create Directory From Cart" msgstr "Lag katalog fra Cart" @@ -859,17 +1045,53 @@ msgstr "personer fra" #: 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:200 +msgid "Create Directory From Cart" +msgstr "Lag katalog fra Cart" + +#: CartView.php:224 CartView.php:266 +msgid "Generate Labels" +msgstr "Generere etiketter" + +#: CartView.php:232 +msgid "Bulk Mail Presort" +msgstr "Bulk Mail Presort" + +#: CartView.php:241 +msgid "Quiet Presort" +msgstr "Stille Presort" + +#: CartView.php:287 +msgid "Your cart contains" +msgstr "Handlekurven inneholder" + +#: CartView.php:287 +msgid "persons from" +msgstr "personer fra" + +#: 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 "Fjern" +<<<<<<< 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 "Ja" +<<<<<<< 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" @@ -888,7 +1110,11 @@ msgstr "Velg hendelsen som du ønsker å kontrollere folk i for" msgid "Select Event" msgstr "Velg hendelse" +<<<<<<< HEAD #: external/templates/verify/verify-family-info.php:140 +======= +#: external/templates/verify/verify-family-info.php:150 +>>>>>>> master msgid "Verify" msgstr "Verifisere" @@ -929,16 +1155,28 @@ msgstr "Handling" msgid "No Attendees Assigned to Event" msgstr "Ingen deltakere Assigned til Event" +<<<<<<< HEAD #: Checkin.php:480 Include/Functions.php:1658 Reports/CanvassReports.php:245 +======= +#: Checkin.php:472 Include/Functions.php:1658 Reports/CanvassReports.php:245 +>>>>>>> master #: Reports/VotingMembers.php:88 queryparameteroptions_qpo.php:15 msgid "Member" msgstr "Medlem" +<<<<<<< HEAD #: Checkin.php:482 ChurchCRM/Service/PersonService.php:38 msgid " of the" msgstr "av" #: Checkin.php:484 ChurchCRM/Service/PersonService.php:40 PersonView.php:267 +======= +#: Checkin.php:474 ChurchCRM/Service/PersonService.php:38 +msgid " of the" +msgstr "av" + +#: Checkin.php:476 ChurchCRM/Service/PersonService.php:40 PersonView.php:267 +>>>>>>> master msgid "(No assigned family)" msgstr "(Ingen tildelt familie)" @@ -1015,21 +1253,35 @@ msgstr "Hvilken rolle er et barn?" msgid "Information to Include" msgstr "Informasjon til Inkluder" +<<<<<<< HEAD #: AutoPaymentEditor.php:690 AutoPaymentEditor.php:695 CartToFamily.php:239 #: CartToFamily.php:244 CartView.php:287 CSVExport.php:105 CSVExport.php:110 +======= +#: 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 "Adresse" #: 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" @@ -1039,7 +1291,11 @@ msgstr "Bursdag" msgid "Family Home Phone" msgstr "Familie Home Phone" +<<<<<<< HEAD #: ChurchCRM/tasks/FamilyWorkPhoneTask.php:30 DirectoryReports.php:181 +======= +#: DirectoryReports.php:181 +>>>>>>> master msgid "Family Work Phone" msgstr "Familie Work Phone" @@ -1048,7 +1304,11 @@ msgid "Family Cell Phone" msgstr "Familie Cell Phone" #: 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 "Familien e" @@ -1236,11 +1496,19 @@ msgstr "Recurrance Mønster" msgid "Attendance Counts" msgstr "Oppmøte teller" +<<<<<<< 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 @@ -1249,7 +1517,11 @@ msgid "Family" msgstr "Familie" #: ElectronicPaymentList.php:199 FamilyCustomFieldsEditor.php:329 +<<<<<<< HEAD #: FamilyCustomFieldsEditor.php:431 FamilyView.php:534 FamilyView.php:639 +======= +#: FamilyCustomFieldsEditor.php:431 FamilyView.php:547 FamilyView.php:655 +>>>>>>> master #: 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 @@ -1257,19 +1529,32 @@ msgstr "Familie" msgid "Type" msgstr "Type" +<<<<<<< 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 "Regnskapsåret" +<<<<<<< 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 "Beløp" +<<<<<<< HEAD #: AutoPaymentEditor.php:654 ElectronicPaymentList.php:204 FamilyView.php:643 #: FamilyView.php:746 FinancialReports.php:305 SelectDelete.php:215 +======= +#: AutoPaymentEditor.php:868 ElectronicPaymentList.php:204 FamilyView.php:659 +#: FamilyView.php:763 FinancialReports.php:305 SelectDelete.php:215 +>>>>>>> master msgid "Fund" msgstr "Fond" @@ -1288,8 +1573,13 @@ msgid "Year" msgstr "År" #: 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 @@ -1556,7 +1846,11 @@ msgid "Custom Fields" msgstr "Custom Fields" #: 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 "Familiemedlemmer" @@ -1577,7 +1871,11 @@ msgstr "Midt" msgid "Last" msgstr "Siste" +<<<<<<< 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" @@ -1660,15 +1958,24 @@ msgstr "Unk" msgid "Family View" msgstr "Familievisning" +<<<<<<< HEAD #: FamilyView.php:232 msgid "Latitude/Longitude" msgstr "Breddegrad / lengdegrad" #: FamilyEditor.php:881 FamilyView.php:249 ManageEnvelopes.php:170 +======= +#: FamilyView.php:236 +msgid "Latitude/Longitude" +msgstr "Breddegrad / lengdegrad" + +#: FamilyEditor.php:881 FamilyView.php:254 ManageEnvelopes.php:170 +>>>>>>> master #: PledgeEditor.php:528 msgid "Envelope Number" msgstr "Konvolutt nummer" +<<<<<<< HEAD #: FamilyView.php:308 msgid "Previous Family" msgstr "Forrige Family" @@ -1694,24 +2001,64 @@ msgid "No property assignments." msgstr "Ingen av oppdrag." #: FamilyView.php:536 GroupView.php:356 PersonView.php:655 PrintView.php:451 +======= +#: FamilyView.php:315 +msgid "Previous Family" +msgstr "Forrige Family" + +#: FamilyView.php:323 +msgid "Next Family" +msgstr "Neste Family" + +#: FamilyView.php:199 PersonView.php:197 +msgid "Upload Photo" +msgstr "Last bilde" + +#: FamilyView.php:204 PersonView.php:201 +msgid "Delete Photo" +msgstr "Slett bilde" + +#: FamilyView.php:455 +msgid "Pledges and Payments" +msgstr "Pantstillelser og Betaling" + +#: FamilyView.php:540 PersonView.php:647 PrintView.php:446 +msgid "No property assignments." +msgstr "Ingen av oppdrag." + +#: FamilyView.php:549 GroupView.php:356 PersonView.php:655 PrintView.php:451 +>>>>>>> master #: PropertyAssign.php:180 SystemSettings.php:152 msgid "Value" msgstr "Verdi" +<<<<<<< HEAD #: FamilyView.php:539 FamilyView.php:577 GroupView.php:359 GroupView.php:395 msgid "Edit Value" msgstr "Rediger verdi" #: FamilyView.php:600 PersonView.php:688 +======= +#: FamilyView.php:552 FamilyView.php:590 GroupView.php:359 GroupView.php:395 +msgid "Edit Value" +msgstr "Rediger verdi" + +#: FamilyView.php:613 PersonView.php:688 +>>>>>>> master #, fuzzy msgid "Assign a New Property" msgstr "Tildele en ny egenskap" +<<<<<<< HEAD #: FamilyView.php:618 GroupView.php:433 PersonView.php:724 PersonView.php:810 +======= +#: FamilyView.php:634 GroupView.php:433 PersonView.php:724 PersonView.php:810 +>>>>>>> master #: PropertyAssign.php:189 SelectList.php:1081 msgid "Assign" msgstr "Tildele" +<<<<<<< HEAD #: FamilyView.php:640 msgid "Next payment date" msgstr "Neste utbetalingsdato" @@ -1750,11 +2097,52 @@ msgstr "Pantsette eller betaling" #: AutoPaymentEditor.php:632 CanvassEditor.php:198 DepositSlipEditor.php:82 #: EditEventAttendees.php:33 FamilyView.php:748 FindFundRaiser.php:241 +======= +#: FamilyView.php:656 +msgid "Next payment date" +msgstr "Neste utbetalingsdato" + +#: FamilyView.php:658 +msgid "Interval (months)" +msgstr "Intervall (måneder)" + +#: FamilyView.php:662 FamilyView.php:773 SelectDelete.php:222 +msgid "Date Updated" +msgstr "Dato oppdatert" + +#: FamilyView.php:663 FamilyView.php:774 SelectDelete.php:223 +msgid "Updated By" +msgstr "Oppdatert av" + +#: FamilyView.php:729 +msgid "Add a new automatic payment" +msgstr "Legg til en ny automatisk betaling" + +#: FamilyView.php:741 +msgid "Show Pledges" +msgstr "Vis Pantstillelser" + +#: FamilyView.php:745 +msgid "Show Payments" +msgstr "Vis betalinger" + +#: FamilyView.php:754 MemberRoleChange.php:120 PropertyAssign.php:191 +msgid "Update" +msgstr "Oppdater" + +#: FamilyView.php:762 +msgid "Pledge or Payment" +msgstr "Pantsette eller betaling" + +#: 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 "Dato" +<<<<<<< HEAD #: FamilyView.php:750 msgid "NonDeductible" msgstr "Nondeductible" @@ -1784,6 +2172,37 @@ msgid " Canvass Entry" msgstr "Canvass Entry" #: DepositSlipEditor.php:223 FamilyView.php:880 FindDepositSlip.php:98 +======= +#: FamilyView.php:767 +msgid "NonDeductible" +msgstr "Nondeductible" + +#: FamilyView.php:768 SelectDelete.php:219 +msgid "Schedule" +msgstr "Planlegg" + +#: FamilyView.php:769 SelectDelete.php:220 +msgid "Method" +msgstr "Metode" + +#: FamilyView.php:770 PledgeEditor.php:725 SelectDelete.php:221 +msgid "Comment" +msgstr "Kommentar" + +#: FamilyView.php:862 +msgid "Add a new pledge" +msgstr "Legg til en ny pant" + +#: FamilyView.php:864 +msgid "Add a new payment" +msgstr "Legg til en ny betaling" + +#: FamilyView.php:875 +msgid " Canvass Entry" +msgstr "Canvass Entry" + +#: DepositSlipEditor.php:223 FamilyView.php:897 FindDepositSlip.php:98 +>>>>>>> master #: PersonView.php:897 PledgeDelete.php:23 msgid "Confirm Delete" msgstr "Bekreft sletting" @@ -2368,7 +2787,11 @@ msgstr "Gruppe-spesifikke egenskaper" msgid "Disabled for this group." msgstr "Deaktivert for denne gruppen." +<<<<<<< HEAD #: FamilyView.php:438 GroupView.php:342 PersonView.php:382 PrintView.php:435 +======= +#: FamilyView.php:449 GroupView.php:342 PersonView.php:382 PrintView.php:435 +>>>>>>> master #, fuzzy msgid "Assigned Properties" msgstr "Tilordnede Egenskaper" @@ -2430,6 +2853,7 @@ msgstr "Ugyldig brukernavn eller passord" msgid "Too many failed logins: your account has been locked. Please contact an administrator." msgstr "For mange mislykkede pålogginger: kontoen din har blitt låst. Ta kontakt med en administrator." +<<<<<<< HEAD #: Login.php:162 msgid "Please Login" msgstr "Vennligst Logg inn" @@ -2439,6 +2863,17 @@ msgid "Password" msgstr "Passord" #: Login.php:150 Login.php:207 +======= +#: Login.php:159 +msgid "Please Login" +msgstr "Vennligst Logg inn" + +#: BackupDatabase.php:76 Login.php:184 UserList.php:56 +msgid "Password" +msgstr "Passord" + +#: Login.php:147 Login.php:198 +>>>>>>> master msgid "Login" msgstr "Logg" @@ -2451,8 +2886,13 @@ msgstr "Konvolutt leder" msgid "Update Family Records" msgstr "Legg til en ny familie Record" +<<<<<<< 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 #, fuzzy msgid "Confirm" @@ -2525,7 +2965,11 @@ msgid "US Address Verification Report" msgstr "USA-adressen senderapport" #: 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" @@ -2883,7 +3327,11 @@ msgstr "Printable View" #: PrintView.php:325 Reports/CanvassReports.php:244 #: sundayschool/SundaySchoolClassView.php:201 +<<<<<<< HEAD #: sundayschool/SundaySchoolDashboard.php:184 +======= +#: sundayschool/SundaySchoolDashboard.php:196 +>>>>>>> master msgid "Age" msgstr "Alder" @@ -2904,7 +3352,7 @@ msgstr "Merknader:" msgid "Entered:" msgstr "Angitt:" -#: ChurchCRM/Service/TimelineService.php:124 PrintView.php:484 +#: ChurchCRM/Service/TimelineService.php:126 PrintView.php:484 msgid "by" msgstr "av" @@ -3014,8 +3462,13 @@ msgid "Add a New Property Type" msgstr "Legg til en ny Eiendomstype" #: 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 "Klasse" @@ -3209,7 +3662,11 @@ msgstr "Slett Family Record og familiemedlemmer" msgid "Person Listing" msgstr "Person Listing" +<<<<<<< HEAD #: SelectList.php:184 menuconfig_mcf.php:12 +======= +#: SelectList.php:184 menuconfig_mcf.php:13 +>>>>>>> master msgid "Group Assignment Helper" msgstr "Gruppeoppgave Helper" @@ -3323,11 +3780,19 @@ msgstr "Kalenderår" msgid "US Address Verification" msgstr "USA Adressebekreftelse" +<<<<<<< HEAD #: UserList.php:118 msgid "User Delete Confirmation" msgstr "Bruker Slett Bekreftelse" #: UserList.php:120 +======= +#: UserList.php:121 +msgid "User Delete Confirmation" +msgstr "Bruker Slett Bekreftelse" + +#: UserList.php:123 +>>>>>>> master msgid "Please confirm removal of user status from:" msgstr "Vennligst bekreft fjerning av brukeren status fra:" @@ -3495,7 +3960,11 @@ msgstr "Nytt passord" msgid "Confirm New Password" msgstr "Bekreft nytt passord" +<<<<<<< HEAD #: UserList.php:163 +======= +#: UserList.php:166 +>>>>>>> master #, fuzzy msgid "Please confirm the password reset of this user" msgstr "Vennligst bekreft passordet reset av denne brukeren" @@ -3834,8 +4303,13 @@ msgstr "Liaison" msgid "City, State, Zip" msgstr "City, State, Zip" +<<<<<<< HEAD #: 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:40 FamilyEditor.php:787 +#: FamilyView.php:241 Reports/ConfirmReportEmail.php:144 +>>>>>>> master #: Reports/ConfirmReport.php:145 msgid "Send Newsletter" msgstr "Send nyhetsbrev" diff --git a/src/locale/nl_NL/LC_MESSAGES/messages.po b/src/locale/nl_NL/LC_MESSAGES/messages.po index d6fffbfa4c..98d5da5038 100644 --- a/src/locale/nl_NL/LC_MESSAGES/messages.po +++ b/src/locale/nl_NL/LC_MESSAGES/messages.po @@ -21,8 +21,13 @@ msgstr "Bevestig Verwijdering Automatische betaling" #: DonationFundEditor.php:186 EditEventAttendees.php:76 #: ElectronicPaymentList.php:222 ElectronicPaymentList.php:288 #: EventNames.php:305 FamilyCustomFieldsEditor.php:334 +<<<<<<< HEAD #: FamilyCustomFieldsEditor.php:392 FamilyView.php:645 FamilyView.php:697 #: FamilyView.php:755 FamilyView.php:892 FindDepositSlip.php:108 +======= +#: FamilyCustomFieldsEditor.php:392 FamilyView.php:661 FamilyView.php:713 +#: FamilyView.php:772 FamilyView.php:909 FindDepositSlip.php:108 +>>>>>>> master #: FundRaiserEditor.php:204 ListEvents.php:250 PaddleNumList.php:60 #: PersonCustomFieldsEditor.php:318 PersonCustomFieldsEditor.php:387 #: PersonView.php:908 PledgeDelete.php:57 PropertyList.php:69 @@ -31,11 +36,19 @@ msgstr "Bevestig Verwijdering Automatische betaling" msgid "Delete" msgstr "Verwijder" +<<<<<<< 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 @@ -43,17 +56,29 @@ msgstr "Verwijder" #: 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 "Annuleren" +<<<<<<< HEAD #: AutoPaymentEditor.php:131 msgid "Automatic payment configuration for the " msgstr "Automatische betaling configuratie voor de " #: AutoPaymentEditor.php:582 CanvassEditor.php:242 DepositSlipEditor.php:98 +======= +#: AutoPaymentEditor.php:133 +msgid "Automatic payment configuration for the " +msgstr "Automatische betaling configuratie voor de " + +#: 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 @@ -66,7 +91,11 @@ msgstr "Automatische betaling configuratie voor de " msgid "Save" msgstr "Bewaar" +<<<<<<< HEAD #: AutoPaymentEditor.php:599 BatchWinnerEntry.php:87 BatchWinnerEntry.php:99 +======= +#: AutoPaymentEditor.php:808 BatchWinnerEntry.php:87 BatchWinnerEntry.php:99 +>>>>>>> master #: 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 @@ -78,6 +107,7 @@ msgstr "Bewaar" msgid "Unassigned" msgstr "Niet Toegekend" +<<<<<<< HEAD #: AutoPaymentEditor.php:619 msgid "Automatic payment type" msgstr "automatisch betalings type" @@ -91,36 +121,71 @@ msgid "Payment interval (months)" msgstr "Betalings regelmaat (maand)" #: AutoPaymentEditor.php:657 CartToGroup.php:80 EditEventTypes.php:91 +======= +#: AutoPaymentEditor.php:828 +msgid "Automatic payment type" +msgstr "automatisch betalings type" + +#: AutoPaymentEditor.php:858 +msgid "Payment amount" +msgstr "Betalings bedrag" + +#: AutoPaymentEditor.php:863 +msgid "Payment interval (months)" +msgstr "Betalings regelmaat (maand)" + +#: 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 "Geen" +<<<<<<< HEAD #: AutoPaymentEditor.php:670 msgid "inactive" msgstr "inactief" #: AutoPaymentEditor.php:700 CartToFamily.php:249 CSVExport.php:115 +======= +#: AutoPaymentEditor.php:884 +msgid "inactive" +msgstr "inactief" + +#: 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 "Plaats" +<<<<<<< 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 "Provincie" +<<<<<<< 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 "Land" +<<<<<<< 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 @@ -128,30 +193,48 @@ msgstr "Land" msgid "Phone" msgstr "Telefoon" +<<<<<<< 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 "Email" +<<<<<<< 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 "Credit kaart" +<<<<<<< HEAD #: AutoPaymentEditor.php:745 msgid "Expiration Month" msgstr "Vervaldatum maand" @@ -169,6 +252,25 @@ msgid "Bank Route Number" msgstr "Bank Route Nummer" #: AutoPaymentEditor.php:765 +======= +#: AutoPaymentEditor.php:969 +msgid "Expiration Month" +msgstr "Vervaldatum maand" + +#: AutoPaymentEditor.php:975 +msgid "Expiration Year" +msgstr "Vervaldatum jaar" + +#: AutoPaymentEditor.php:981 +msgid "Bank Name" +msgstr "Bank Naam" + +#: AutoPaymentEditor.php:987 +msgid "Bank Route Number" +msgstr "Bank Route Nummer" + +#: AutoPaymentEditor.php:993 +>>>>>>> master msgid "Bank Account Number" msgstr "Bank Rekeningnummer" @@ -228,10 +330,17 @@ msgstr "Voer Winnaars" msgid "CSV Export" msgstr "CVS Export" +<<<<<<< HEAD #: AutoPaymentEditor.php:685 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:182 +======= +#: 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 +>>>>>>> master msgid "Last Name" msgstr "Achternaam" @@ -239,10 +348,17 @@ msgstr "Achternaam" msgid "Required" msgstr "Noodzakelijk" +<<<<<<< HEAD #: AutoPaymentEditor.php:680 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:181 +======= +#: 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 +>>>>>>> master msgid "First Name" msgstr "Voornaam" @@ -250,7 +366,11 @@ msgstr "Voornaam" msgid "Middle Name" msgstr "Tussenvoegsel" +<<<<<<< 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 @@ -273,7 +393,11 @@ msgstr "Werk/Andere Email" msgid "Membership Date" msgstr "Lidmaatschapsdatum" +<<<<<<< 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 "Familie Rol" @@ -410,9 +534,15 @@ msgstr "Bijdrage Enveloppe" #: 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 @@ -422,8 +552,13 @@ msgid "Home Phone" msgstr "Telefoon Thuis" #: 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 @@ -431,8 +566,13 @@ msgid "Work Phone" msgstr "Telefoon Werk" #: 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" @@ -444,13 +584,22 @@ msgstr "Werk / Ander Email" #: 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 "Geboortedatum" #: 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 "Trouwdatum" @@ -482,7 +631,11 @@ msgstr "LET OP: Schijdingstekens (-, +, _ etc) toevoegen hoeft niet" msgid "Default country if none specified otherwise" msgstr "Standaard Land if geen land is aangegeven" +<<<<<<< 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" @@ -671,11 +824,19 @@ msgstr "Geen familie naam ingevoerd!" msgid "Add Cart to Family" msgstr "Voeg mandje toe aan Familie" +<<<<<<< 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 #: EventNames.php:266 FamilyCustomFieldsEditor.php:330 #: FamilyCustomFieldsEditor.php:444 FamilyList.php:43 FamilyView.php:535 +======= +#: 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:330 +#: FamilyCustomFieldsEditor.php:444 FamilyList.php:43 FamilyView.php:548 +>>>>>>> master #: GeoPage.php:385 GroupEditor.php:77 GroupPropsFormEditor.php:284 #: GroupPropsFormEditor.php:396 GroupView.php:321 GroupView.php:355 #: PersonCustomFieldsEditor.php:314 PersonCustomFieldsEditor.php:445 @@ -754,19 +915,27 @@ msgstr "Voeg toe aan Groep" msgid "Create a New Group" msgstr "Voer een Nieuwe Groep in" -#: CartView.php:42 +#: CartView.php:41 msgid "View Your Cart" msgstr "Bekijk Uw mandje" -#: CartView.php:50 +#: CartView.php:49 msgid "You have no items in your cart." msgstr "U heeft geen object in het mandje " +<<<<<<< HEAD #: CartView.php:59 msgid "Back to Menu" msgstr "Terug naar menu" #: CartView.php:94 +======= +#: CartView.php:58 +msgid "Back to Menu" +msgstr "Terug naar menu" + +#: CartView.php:93 +>>>>>>> master msgid "Go To Labels" msgstr "Ga naar Etiketten" @@ -774,6 +943,7 @@ msgstr "Ga naar Etiketten" msgid "Empty Cart" msgstr "Leeg mandje" +<<<<<<< HEAD #: CartView.php:113 Include/Header.php:131 msgid "Empty Cart to Group" msgstr "Leeg mandje in Groep" @@ -783,6 +953,17 @@ msgid "Empty Cart to Family" msgstr "Leeg mandje in Familie" #: CartView.php:121 Include/Header.php:141 +======= +#: CartView.php:114 Include/Header.php:131 +msgid "Empty Cart to Group" +msgstr "Leeg mandje in Groep" + +#: CartView.php:120 Include/Header.php:136 +msgid "Empty Cart to Family" +msgstr "Leeg mandje in Familie" + +#: CartView.php:124 Include/Header.php:141 +>>>>>>> master msgid "Empty Cart to Event" msgstr "Leeg mandje in Evenement" @@ -790,7 +971,11 @@ msgstr "Leeg mandje in Evenement" msgid "Map Cart" msgstr "Route mandje " +<<<<<<< HEAD #: CartView.php:129 +======= +#: CartView.php:135 +>>>>>>> master msgid "Name Tags" msgstr "Naam" @@ -798,11 +983,16 @@ msgstr "Naam" msgid "Email Cart" msgstr "Email mandje" +<<<<<<< HEAD #: CartView.php:164 GroupView.php:205 +======= +#: CartView.php:170 GroupView.php:205 +>>>>>>> master #: sundayschool/SundaySchoolClassView.php:100 msgid "Email (BCC)" msgstr "Email (BCC)" +<<<<<<< HEAD #: CartView.php:193 msgid "Create Directory From Cart" msgstr "Maak Adresboek van het mandje" @@ -829,17 +1019,53 @@ msgstr "personen van" #: 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:200 +msgid "Create Directory From Cart" +msgstr "Maak Adresboek van het mandje" + +#: CartView.php:224 CartView.php:266 +msgid "Generate Labels" +msgstr "Genereer Etiketten" + +#: CartView.php:232 +msgid "Bulk Mail Presort" +msgstr "Mass Mail Pre-sorteer" + +#: CartView.php:241 +msgid "Quiet Presort" +msgstr "Stille Pre-sorteer" + +#: CartView.php:287 +msgid "Your cart contains" +msgstr "Uw mandje bevat" + +#: CartView.php:287 +msgid "persons from" +msgstr "personen van" + +#: 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 "Verwijder" +<<<<<<< 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 "Ja" +<<<<<<< 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" @@ -857,7 +1083,11 @@ msgstr "Selecteer het evenement waaraan u personen wilt toevoegen" msgid "Select Event" msgstr "Selecteer Evenement:" +<<<<<<< HEAD #: external/templates/verify/verify-family-info.php:140 +======= +#: external/templates/verify/verify-family-info.php:150 +>>>>>>> master msgid "Verify" msgstr "Controleren" @@ -898,16 +1128,28 @@ msgstr "Actie" msgid "No Attendees Assigned to Event" msgstr "Geen bezoekers toegewezen aan Evenement" +<<<<<<< HEAD #: Checkin.php:480 Include/Functions.php:1658 Reports/CanvassReports.php:245 +======= +#: Checkin.php:472 Include/Functions.php:1658 Reports/CanvassReports.php:245 +>>>>>>> master #: Reports/VotingMembers.php:88 queryparameteroptions_qpo.php:15 msgid "Member" msgstr "Lid" +<<<<<<< HEAD #: Checkin.php:482 ChurchCRM/Service/PersonService.php:38 msgid " of the" msgstr " van de" #: Checkin.php:484 ChurchCRM/Service/PersonService.php:40 PersonView.php:267 +======= +#: Checkin.php:474 ChurchCRM/Service/PersonService.php:38 +msgid " of the" +msgstr " van de" + +#: Checkin.php:476 ChurchCRM/Service/PersonService.php:40 PersonView.php:267 +>>>>>>> master msgid "(No assigned family)" msgstr "(Geen gekoppelde familie)" @@ -983,21 +1225,35 @@ msgstr "Welke rol is een kind?" msgid "Information to Include" msgstr "Informatie om toe te Voegen" +<<<<<<< HEAD #: AutoPaymentEditor.php:690 AutoPaymentEditor.php:695 CartToFamily.php:239 #: CartToFamily.php:244 CartView.php:287 CSVExport.php:105 CSVExport.php:110 +======= +#: 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 "Adres" #: 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" @@ -1007,7 +1263,11 @@ msgstr "Geboortedatum" msgid "Family Home Phone" msgstr "Tel.No Thuis van Familie" +<<<<<<< HEAD #: ChurchCRM/tasks/FamilyWorkPhoneTask.php:30 DirectoryReports.php:181 +======= +#: DirectoryReports.php:181 +>>>>>>> master msgid "Family Work Phone" msgstr "Werk Tel.No van Familie" @@ -1016,7 +1276,11 @@ msgid "Family Cell Phone" msgstr "Mobiele Tel.No van Familie" #: 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 "Email van Familie" @@ -1195,11 +1459,19 @@ msgstr "Periodiek Patroon" msgid "Attendance Counts" msgstr "Opkomst Tellingen" +<<<<<<< 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 @@ -1207,19 +1479,32 @@ msgstr "Opkomst Tellingen" msgid "Family" msgstr "Familie" +<<<<<<< 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 "Fiscaal Jaar" +<<<<<<< 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 "Bedrag" +<<<<<<< HEAD #: AutoPaymentEditor.php:654 ElectronicPaymentList.php:204 FamilyView.php:643 #: FamilyView.php:746 FinancialReports.php:305 SelectDelete.php:215 +======= +#: AutoPaymentEditor.php:868 ElectronicPaymentList.php:204 FamilyView.php:659 +#: FamilyView.php:763 FinancialReports.php:305 SelectDelete.php:215 +>>>>>>> master msgid "Fund" msgstr "Fonds" @@ -1238,8 +1523,13 @@ msgid "Year" msgstr "Jaar" #: 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 @@ -1498,7 +1788,11 @@ msgid "Custom Fields" msgstr "Aanpasbare Velden" #: 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 "Familie Leden" @@ -1519,7 +1813,11 @@ msgstr "Tussenvoegsel" msgid "Last" msgstr "Achternaam" +<<<<<<< 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" @@ -1602,15 +1900,24 @@ msgstr "Onb" msgid "Family View" msgstr "Familie Overzicht" +<<<<<<< HEAD #: FamilyView.php:232 msgid "Latitude/Longitude" msgstr "Beedte/Lengte" #: FamilyEditor.php:881 FamilyView.php:249 ManageEnvelopes.php:170 +======= +#: FamilyView.php:236 +msgid "Latitude/Longitude" +msgstr "Beedte/Lengte" + +#: FamilyEditor.php:881 FamilyView.php:254 ManageEnvelopes.php:170 +>>>>>>> master #: PledgeEditor.php:528 msgid "Envelope Number" msgstr "Envelop Nummer" +<<<<<<< HEAD #: FamilyView.php:308 msgid "Previous Family" msgstr "Vorige Familie" @@ -1640,10 +1947,42 @@ msgid "No property assignments." msgstr "Geen toegevoegde Eigenschappen." #: FamilyView.php:536 GroupView.php:356 PersonView.php:655 PrintView.php:451 +======= +#: FamilyView.php:315 +msgid "Previous Family" +msgstr "Vorige Familie" + +#: FamilyView.php:323 +msgid "Next Family" +msgstr "Volgende Familie" + +#: FamilyView.php:199 PersonView.php:197 +msgid "Upload Photo" +msgstr "Upload Foto" + +#: FamilyView.php:204 PersonView.php:201 +msgid "Delete Photo" +msgstr "Verwijder Foto" + +#: FamilyView.php:453 +msgid "Automatic Payments" +msgstr "Automatische Betalingen" + +#: FamilyView.php:455 +msgid "Pledges and Payments" +msgstr "Bijdrage en Betalingen" + +#: FamilyView.php:540 PersonView.php:647 PrintView.php:446 +msgid "No property assignments." +msgstr "Geen toegevoegde Eigenschappen." + +#: FamilyView.php:549 GroupView.php:356 PersonView.php:655 PrintView.php:451 +>>>>>>> master #: PropertyAssign.php:180 SystemSettings.php:152 msgid "Value" msgstr "Waarde" +<<<<<<< HEAD #: FamilyView.php:539 FamilyView.php:577 GroupView.php:359 GroupView.php:395 msgid "Edit Value" msgstr "Wijzig Waarde" @@ -1653,10 +1992,22 @@ msgid "Assign a New Property" msgstr "Voeg een Nieuwe Eigenschap toe" #: 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 "Wijzig Waarde" + +#: FamilyView.php:613 PersonView.php:688 +msgid "Assign a New Property" +msgstr "Voeg een Nieuwe Eigenschap toe" + +#: FamilyView.php:634 GroupView.php:433 PersonView.php:724 PersonView.php:810 +>>>>>>> master #: PropertyAssign.php:189 SelectList.php:1081 msgid "Assign" msgstr "Koppel" +<<<<<<< HEAD #: FamilyView.php:640 msgid "Next payment date" msgstr "Volgende Betaal datum" @@ -1695,11 +2046,52 @@ msgstr "Belofte of Betaling" #: AutoPaymentEditor.php:632 CanvassEditor.php:198 DepositSlipEditor.php:82 #: EditEventAttendees.php:33 FamilyView.php:748 FindFundRaiser.php:241 +======= +#: FamilyView.php:656 +msgid "Next payment date" +msgstr "Volgende Betaal datum" + +#: FamilyView.php:658 +msgid "Interval (months)" +msgstr "Interval (Maanden)" + +#: FamilyView.php:662 FamilyView.php:773 SelectDelete.php:222 +msgid "Date Updated" +msgstr "Datum Vernieuwd" + +#: FamilyView.php:663 FamilyView.php:774 SelectDelete.php:223 +msgid "Updated By" +msgstr "Vernieuwd Door" + +#: FamilyView.php:729 +msgid "Add a new automatic payment" +msgstr "Voer een nieuwe automatische betaling in" + +#: FamilyView.php:741 +msgid "Show Pledges" +msgstr "Toon Bijdrage Beloftes" + +#: FamilyView.php:745 +msgid "Show Payments" +msgstr "Toon Betalingen" + +#: FamilyView.php:754 MemberRoleChange.php:120 PropertyAssign.php:191 +msgid "Update" +msgstr "Vernieuw" + +#: FamilyView.php:762 +msgid "Pledge or Payment" +msgstr "Belofte of Betaling" + +#: 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 "Datum" +<<<<<<< HEAD #: FamilyView.php:750 msgid "NonDeductible" msgstr "Niet Aftrekbaar" @@ -1729,6 +2121,37 @@ msgid " Canvass Entry" msgstr "Enquete intoetsen" #: DepositSlipEditor.php:223 FamilyView.php:880 FindDepositSlip.php:98 +======= +#: FamilyView.php:767 +msgid "NonDeductible" +msgstr "Niet Aftrekbaar" + +#: FamilyView.php:768 SelectDelete.php:219 +msgid "Schedule" +msgstr "Programma" + +#: FamilyView.php:769 SelectDelete.php:220 +msgid "Method" +msgstr "Methode" + +#: FamilyView.php:770 PledgeEditor.php:725 SelectDelete.php:221 +msgid "Comment" +msgstr "Commentaar" + +#: FamilyView.php:862 +msgid "Add a new pledge" +msgstr "Voeg een nieuwe belofte toe" + +#: FamilyView.php:864 +msgid "Add a new payment" +msgstr "Voeg een nieuwe betaling toe" + +#: FamilyView.php:875 +msgid " Canvass Entry" +msgstr "Enquete intoetsen" + +#: DepositSlipEditor.php:223 FamilyView.php:897 FindDepositSlip.php:98 +>>>>>>> master #: PersonView.php:897 PledgeDelete.php:23 msgid "Confirm Delete" msgstr "Bevestig Verwijdering" @@ -2282,7 +2705,11 @@ msgstr "Groep-Specifieke Eigenschappen" msgid "Disabled for this group." msgstr "Uitgezet voor deze groep." +<<<<<<< HEAD #: FamilyView.php:438 GroupView.php:342 PersonView.php:382 PrintView.php:435 +======= +#: FamilyView.php:449 GroupView.php:342 PersonView.php:382 PrintView.php:435 +>>>>>>> master msgid "Assigned Properties" msgstr "Toegevoegde Eigenschappen" @@ -2343,6 +2770,7 @@ msgstr "Onjuist login of wachtwoord" msgid "Too many failed logins: your account has been locked. Please contact an administrator." msgstr "Teveel mislukte logins: uw toegang is geblokkeerd. Neem contact op met een Administrateur." +<<<<<<< HEAD #: Login.php:162 msgid "Please Login" msgstr "Aub inloggen" @@ -2352,6 +2780,17 @@ msgid "Password" msgstr "Wachtwoord" #: Login.php:150 Login.php:207 +======= +#: Login.php:159 +msgid "Please Login" +msgstr "Aub inloggen" + +#: BackupDatabase.php:76 Login.php:184 UserList.php:56 +msgid "Password" +msgstr "Wachtwoord" + +#: Login.php:147 Login.php:198 +>>>>>>> master msgid "Login" msgstr "Login" @@ -2363,8 +2802,13 @@ msgstr "Envelope Manager" msgid "Update Family Records" msgstr "Pas Familie Record aan" +<<<<<<< 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 "Bevestig" @@ -2435,7 +2879,11 @@ msgid "US Address Verification Report" msgstr "Amerikaanse Address Verification Report" #: 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" @@ -2775,7 +3223,11 @@ msgstr "Afdruk Voorbeeld" #: PrintView.php:325 Reports/CanvassReports.php:244 #: sundayschool/SundaySchoolClassView.php:201 +<<<<<<< HEAD #: sundayschool/SundaySchoolDashboard.php:184 +======= +#: sundayschool/SundaySchoolDashboard.php:196 +>>>>>>> master msgid "Age" msgstr "Leeftijd" @@ -2795,7 +3247,7 @@ msgstr "Notities:" msgid "Entered:" msgstr "Ingevoerd:" -#: ChurchCRM/Service/TimelineService.php:124 PrintView.php:484 +#: ChurchCRM/Service/TimelineService.php:126 PrintView.php:484 msgid "by" msgstr "Naast" @@ -2902,8 +3354,13 @@ msgid "Add a New Property Type" msgstr "Voeg een Nieuw Eigenschap Type" #: 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 "Klas" @@ -3091,7 +3548,11 @@ msgstr "Verwijdeer Familie EN Familie Leden" msgid "Person Listing" msgstr "Persoon Lijst" +<<<<<<< HEAD #: SelectList.php:184 menuconfig_mcf.php:12 +======= +#: SelectList.php:184 menuconfig_mcf.php:13 +>>>>>>> master msgid "Group Assignment Helper" msgstr "Groep Koppeling Helper" @@ -3201,11 +3662,19 @@ msgstr "Kalender Jaar" msgid "US Address Verification" msgstr "Amerikaanse Address Verification" +<<<<<<< HEAD #: UserList.php:118 msgid "User Delete Confirmation" msgstr "Bevestiging Verwijderen Gebruiker" #: UserList.php:120 +======= +#: UserList.php:121 +msgid "User Delete Confirmation" +msgstr "Bevestiging Verwijderen Gebruiker" + +#: UserList.php:123 +>>>>>>> master msgid "Please confirm removal of user status from:" msgstr "Bevestig aub verwijdering van gebruikers status van:" @@ -3363,7 +3832,11 @@ msgstr "Nieuw Wachtwoord" msgid "Confirm New Password" msgstr "Bevestig Nieuw Wachtwoord" +<<<<<<< HEAD #: UserList.php:163 +======= +#: UserList.php:166 +>>>>>>> master msgid "Please confirm the password reset of this user" msgstr "Bevestig aub de reset van het wachtwoord van deze gebruiker" @@ -3684,8 +4157,13 @@ msgstr "Liaison" msgid "City, State, Zip" msgstr "Stad, Provincie, Postcode" +<<<<<<< HEAD #: 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:40 FamilyEditor.php:787 +#: FamilyView.php:241 Reports/ConfirmReportEmail.php:144 +>>>>>>> master #: Reports/ConfirmReport.php:145 msgid "Send Newsletter" msgstr "Stuur Nieuwsbrief" @@ -3904,7 +4382,11 @@ msgstr "Bekijk Alle Families" msgid "Events" msgstr "Evenementen" +<<<<<<< HEAD #: FundRaiserEditor.php:35 menuconfig_mcf.php:25 +======= +#: FundRaiserEditor.php:35 menuconfig_mcf.php:26 +>>>>>>> master msgid "Fundraiser" msgstr "Fundraiser" @@ -3912,7 +4394,11 @@ msgstr "Fundraiser" msgid "Deposit Type" msgstr "Bijdrage Type" +<<<<<<< HEAD #: ChurchCRM/dto/SystemConfig.php:219 +======= +#: ChurchCRM/dto/SystemConfig.php:220 +>>>>>>> master msgid "Report Settings" msgstr "Rapportage Instellingen" diff --git a/src/locale/pl_PL/LC_MESSAGES/messages.po b/src/locale/pl_PL/LC_MESSAGES/messages.po index c92780372f..b78cc3a0bc 100644 --- a/src/locale/pl_PL/LC_MESSAGES/messages.po +++ b/src/locale/pl_PL/LC_MESSAGES/messages.po @@ -21,8 +21,13 @@ msgstr "Potwierdź Automatyczne Usunięcie płatności" #: DonationFundEditor.php:186 EditEventAttendees.php:76 #: ElectronicPaymentList.php:222 ElectronicPaymentList.php:288 #: EventNames.php:305 FamilyCustomFieldsEditor.php:334 +<<<<<<< HEAD #: FamilyCustomFieldsEditor.php:392 FamilyView.php:645 FamilyView.php:697 #: FamilyView.php:755 FamilyView.php:892 FindDepositSlip.php:108 +======= +#: FamilyCustomFieldsEditor.php:392 FamilyView.php:661 FamilyView.php:713 +#: FamilyView.php:772 FamilyView.php:909 FindDepositSlip.php:108 +>>>>>>> master #: FundRaiserEditor.php:204 ListEvents.php:250 PaddleNumList.php:60 #: PersonCustomFieldsEditor.php:318 PersonCustomFieldsEditor.php:387 #: PersonView.php:908 PledgeDelete.php:57 PropertyList.php:69 @@ -31,11 +36,19 @@ msgstr "Potwierdź Automatyczne Usunięcie płatności" msgid "Delete" msgstr "Skasuj" +<<<<<<< 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 @@ -43,17 +56,29 @@ msgstr "Skasuj" #: 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 "Anuluj" +<<<<<<< HEAD #: AutoPaymentEditor.php:131 msgid "Automatic payment configuration for the " msgstr "Ustawienie Automatycznej płatności dla rodziny" #: AutoPaymentEditor.php:582 CanvassEditor.php:242 DepositSlipEditor.php:98 +======= +#: AutoPaymentEditor.php:133 +msgid "Automatic payment configuration for the " +msgstr "Ustawienie Automatycznej płatności dla rodziny" + +#: 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 @@ -66,7 +91,11 @@ msgstr "Ustawienie Automatycznej płatności dla rodziny" msgid "Save" msgstr "Zapisz" +<<<<<<< HEAD #: AutoPaymentEditor.php:599 BatchWinnerEntry.php:87 BatchWinnerEntry.php:99 +======= +#: AutoPaymentEditor.php:808 BatchWinnerEntry.php:87 BatchWinnerEntry.php:99 +>>>>>>> master #: 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 @@ -78,6 +107,7 @@ msgstr "Zapisz" msgid "Unassigned" msgstr "Nie przypisany" +<<<<<<< HEAD #: AutoPaymentEditor.php:619 msgid "Automatic payment type" msgstr "Rodzaj Automatycznej płatności" @@ -91,36 +121,71 @@ msgid "Payment interval (months)" msgstr "Częstotliwość Wpłat (miesiące)" #: AutoPaymentEditor.php:657 CartToGroup.php:80 EditEventTypes.php:91 +======= +#: AutoPaymentEditor.php:828 +msgid "Automatic payment type" +msgstr "Rodzaj Automatycznej płatności" + +#: AutoPaymentEditor.php:858 +msgid "Payment amount" +msgstr "Kwota Wpłaty" + +#: AutoPaymentEditor.php:863 +msgid "Payment interval (months)" +msgstr "Częstotliwość Wpłat (miesiące)" + +#: 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 "Żaden" +<<<<<<< HEAD #: AutoPaymentEditor.php:670 msgid "inactive" msgstr "nieaktywne" #: AutoPaymentEditor.php:700 CartToFamily.php:249 CSVExport.php:115 +======= +#: AutoPaymentEditor.php:884 +msgid "inactive" +msgstr "nieaktywne" + +#: 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 "Miasto" +<<<<<<< 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 "Hrabstwo" +<<<<<<< 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 "Kraj" +<<<<<<< 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 @@ -128,30 +193,48 @@ msgstr "Kraj" msgid "Phone" msgstr "Tel." +<<<<<<< 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 "Email" +<<<<<<< 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 "Numer Karty Płatniczej" +<<<<<<< HEAD #: AutoPaymentEditor.php:745 msgid "Expiration Month" msgstr "Data Ważności (miesiąć)" @@ -169,6 +252,25 @@ msgid "Bank Route Number" msgstr "Sort Code" #: AutoPaymentEditor.php:765 +======= +#: AutoPaymentEditor.php:969 +msgid "Expiration Month" +msgstr "Data Ważności (miesiąć)" + +#: AutoPaymentEditor.php:975 +msgid "Expiration Year" +msgstr "Data Ważności (rok)" + +#: AutoPaymentEditor.php:981 +msgid "Bank Name" +msgstr "Nazwa Banku" + +#: AutoPaymentEditor.php:987 +msgid "Bank Route Number" +msgstr "Sort Code" + +#: AutoPaymentEditor.php:993 +>>>>>>> master msgid "Bank Account Number" msgstr "Numer Konta" @@ -234,10 +336,17 @@ msgstr "Wprowadź Wygranych" msgid "CSV Export" msgstr "Eksportuj do CSV" +<<<<<<< HEAD #: AutoPaymentEditor.php:685 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:182 +======= +#: 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 +>>>>>>> master #, fuzzy msgid "Last Name" msgstr "Nazwisko" @@ -246,10 +355,17 @@ msgstr "Nazwisko" msgid "Required" msgstr "Wymagane" +<<<<<<< HEAD #: AutoPaymentEditor.php:680 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:181 +======= +#: 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 +>>>>>>> master #, fuzzy msgid "First Name" msgstr "Imię" @@ -259,7 +375,11 @@ msgstr "Imię" msgid "Middle Name" msgstr "Drugie Imię" +<<<<<<< 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 @@ -296,7 +416,11 @@ msgstr "Data urodzenia / Data ślubu" msgid "Age / Years Married" msgstr "Wiek / Lat małżeństwa" +<<<<<<< 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 #, fuzzy msgid "Family Role" @@ -442,9 +566,15 @@ msgstr "Numer Koperty" #: 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 @@ -454,8 +584,13 @@ msgid "Home Phone" msgstr "Tel. Domowy" #: 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 @@ -463,8 +598,13 @@ msgid "Work Phone" msgstr "Tel. Praca" #: 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" @@ -476,13 +616,22 @@ msgstr "Email Inny/Firmowy" #: 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 "Data Urodzenia" #: 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 "Data Ślubu:" @@ -514,7 +663,11 @@ msgstr "Podpowiedź: spacje, myślniki, etc. albo ich brak nie ma znaczenia" msgid "Default country if none specified otherwise" msgstr "Domyślny kraj jeżeli nie wybrano innego" +<<<<<<< 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" @@ -709,11 +862,19 @@ msgstr "Nie podano nazwy Rodziny!" msgid "Add Cart to Family" msgstr "Dodaj Koszyk do Rodziny" +<<<<<<< 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 #: EventNames.php:266 FamilyCustomFieldsEditor.php:330 #: FamilyCustomFieldsEditor.php:444 FamilyList.php:43 FamilyView.php:535 +======= +#: 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:330 +#: FamilyCustomFieldsEditor.php:444 FamilyList.php:43 FamilyView.php:548 +>>>>>>> master #: GeoPage.php:385 GroupEditor.php:77 GroupPropsFormEditor.php:284 #: GroupPropsFormEditor.php:396 GroupView.php:321 GroupView.php:355 #: PersonCustomFieldsEditor.php:314 PersonCustomFieldsEditor.php:445 @@ -795,19 +956,27 @@ msgstr "Dodaj do Grupy" msgid "Create a New Group" msgstr "Utwórz Nową Grupę" -#: CartView.php:42 +#: CartView.php:41 msgid "View Your Cart" msgstr "Pokaż Koszyk" -#: CartView.php:50 +#: CartView.php:49 msgid "You have no items in your cart." msgstr "Koszyk jest pusty." +<<<<<<< HEAD #: CartView.php:59 msgid "Back to Menu" msgstr "Powrót do Strony Głównej" #: CartView.php:94 +======= +#: CartView.php:58 +msgid "Back to Menu" +msgstr "Powrót do Strony Głównej" + +#: CartView.php:93 +>>>>>>> master msgid "Go To Labels" msgstr "Idź do etykiet" @@ -815,6 +984,7 @@ msgstr "Idź do etykiet" msgid "Empty Cart" msgstr "Wyczyść Koszyk" +<<<<<<< HEAD #: CartView.php:113 Include/Header.php:131 msgid "Empty Cart to Group" msgstr "Opróżnij Koszyk do Grupy" @@ -824,6 +994,17 @@ msgid "Empty Cart to Family" msgstr "Opróżnij Koszyk do Rodziny" #: CartView.php:121 Include/Header.php:141 +======= +#: CartView.php:114 Include/Header.php:131 +msgid "Empty Cart to Group" +msgstr "Opróżnij Koszyk do Grupy" + +#: CartView.php:120 Include/Header.php:136 +msgid "Empty Cart to Family" +msgstr "Opróżnij Koszyk do Rodziny" + +#: CartView.php:124 Include/Header.php:141 +>>>>>>> master msgid "Empty Cart to Event" msgstr "Opróżnij Koszyk do Wydarzenia" @@ -831,7 +1012,11 @@ msgstr "Opróżnij Koszyk do Wydarzenia" msgid "Map Cart" msgstr "Pokaż Koszyk na mapie" +<<<<<<< HEAD #: CartView.php:129 +======= +#: CartView.php:135 +>>>>>>> master msgid "Name Tags" msgstr "Plakietki imienne" @@ -839,11 +1024,16 @@ msgstr "Plakietki imienne" msgid "Email Cart" msgstr "Wyślij Koszyk (email)" +<<<<<<< HEAD #: CartView.php:164 GroupView.php:205 +======= +#: CartView.php:170 GroupView.php:205 +>>>>>>> master #: sundayschool/SundaySchoolClassView.php:100 msgid "Email (BCC)" msgstr "Email (BCC)" +<<<<<<< HEAD #: CartView.php:193 msgid "Create Directory From Cart" msgstr "Utwórz Spis z Koszyka" @@ -870,17 +1060,53 @@ msgstr "osób z" #: 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:200 +msgid "Create Directory From Cart" +msgstr "Utwórz Spis z Koszyka" + +#: CartView.php:224 CartView.php:266 +msgid "Generate Labels" +msgstr "Wygeneruj Etykiety" + +#: CartView.php:232 +msgid "Bulk Mail Presort" +msgstr "Posortuj pocztę" + +#: CartView.php:241 +msgid "Quiet Presort" +msgstr "Szybkie sortowanie" + +#: CartView.php:287 +msgid "Your cart contains" +msgstr "Koszyk zawiera" + +#: CartView.php:287 +msgid "persons from" +msgstr "osób z" + +#: 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 "Usuń" +<<<<<<< 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 "Tak" +<<<<<<< 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" @@ -899,7 +1125,11 @@ msgstr "Wybierz Wydarzenie do którego chciałbyś dodać Osoby" msgid "Select Event" msgstr "Wybierz Wydarzenie" +<<<<<<< HEAD #: external/templates/verify/verify-family-info.php:140 +======= +#: external/templates/verify/verify-family-info.php:150 +>>>>>>> master msgid "Verify" msgstr "Potwierdź" @@ -940,16 +1170,28 @@ msgstr "Akcja" msgid "No Attendees Assigned to Event" msgstr "Nie przypisano żadnych uczestników dla tego Wydarzenia" +<<<<<<< HEAD #: Checkin.php:480 Include/Functions.php:1658 Reports/CanvassReports.php:245 +======= +#: Checkin.php:472 Include/Functions.php:1658 Reports/CanvassReports.php:245 +>>>>>>> master #: Reports/VotingMembers.php:88 queryparameteroptions_qpo.php:15 msgid "Member" msgstr "Członek" +<<<<<<< HEAD #: Checkin.php:482 ChurchCRM/Service/PersonService.php:38 msgid " of the" msgstr "Rodziny" #: Checkin.php:484 ChurchCRM/Service/PersonService.php:40 PersonView.php:267 +======= +#: Checkin.php:474 ChurchCRM/Service/PersonService.php:38 +msgid " of the" +msgstr "Rodziny" + +#: Checkin.php:476 ChurchCRM/Service/PersonService.php:40 PersonView.php:267 +>>>>>>> master msgid "(No assigned family)" msgstr "(Brak przypisanej Rodziny)" @@ -1026,21 +1268,35 @@ msgstr "Którą rolę pełni Dziecko?" msgid "Information to Include" msgstr "Informacje które powinny być zawarte" +<<<<<<< HEAD #: AutoPaymentEditor.php:690 AutoPaymentEditor.php:695 CartToFamily.php:239 #: CartToFamily.php:244 CartView.php:287 CSVExport.php:105 CSVExport.php:110 +======= +#: 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 "Adres" #: 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" @@ -1050,7 +1306,11 @@ msgstr "Data Urodzenia" msgid "Family Home Phone" msgstr "Tel. Domowy" +<<<<<<< HEAD #: ChurchCRM/tasks/FamilyWorkPhoneTask.php:30 DirectoryReports.php:181 +======= +#: DirectoryReports.php:181 +>>>>>>> master msgid "Family Work Phone" msgstr "Tel. Praca" @@ -1059,7 +1319,11 @@ msgid "Family Cell Phone" msgstr "Tel. Kom." #: 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 "Email" @@ -1246,11 +1510,19 @@ msgstr "Częstotliwość Wydarzenia" msgid "Attendance Counts" msgstr "Ilość Uczestników" +<<<<<<< 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 @@ -1259,7 +1531,11 @@ msgid "Family" msgstr "Rodzina" #: ElectronicPaymentList.php:199 FamilyCustomFieldsEditor.php:329 +<<<<<<< HEAD #: FamilyCustomFieldsEditor.php:431 FamilyView.php:534 FamilyView.php:639 +======= +#: FamilyCustomFieldsEditor.php:431 FamilyView.php:547 FamilyView.php:655 +>>>>>>> master #: 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 @@ -1267,19 +1543,32 @@ msgstr "Rodzina" msgid "Type" msgstr "Typ" +<<<<<<< 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 "Rok Podatkowy" +<<<<<<< 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 "Kwota" +<<<<<<< HEAD #: AutoPaymentEditor.php:654 ElectronicPaymentList.php:204 FamilyView.php:643 #: FamilyView.php:746 FinancialReports.php:305 SelectDelete.php:215 +======= +#: AutoPaymentEditor.php:868 ElectronicPaymentList.php:204 FamilyView.php:659 +#: FamilyView.php:763 FinancialReports.php:305 SelectDelete.php:215 +>>>>>>> master msgid "Fund" msgstr "Cel" @@ -1298,8 +1587,13 @@ msgid "Year" msgstr "Rok" #: 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 @@ -1569,7 +1863,11 @@ msgid "Custom Fields" msgstr "Pola Dodatkowe" #: 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 "Członkowie Rodziny" @@ -1590,7 +1888,11 @@ msgstr "Drugie Imię" msgid "Last" msgstr "Nazwisko" +<<<<<<< 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" @@ -1673,15 +1975,24 @@ msgstr "NN" msgid "Family View" msgstr "Widok Rodziny" +<<<<<<< HEAD #: FamilyView.php:232 msgid "Latitude/Longitude" msgstr "Szer. / Gł. Geograficzna" #: FamilyEditor.php:881 FamilyView.php:249 ManageEnvelopes.php:170 +======= +#: FamilyView.php:236 +msgid "Latitude/Longitude" +msgstr "Szer. / Gł. Geograficzna" + +#: FamilyEditor.php:881 FamilyView.php:254 ManageEnvelopes.php:170 +>>>>>>> master #: PledgeEditor.php:528 msgid "Envelope Number" msgstr "Nr. Koperty" +<<<<<<< HEAD #: FamilyView.php:308 msgid "Previous Family" msgstr "Poprzednia Rodzina" @@ -1707,24 +2018,64 @@ msgid "No property assignments." msgstr "Nie przypisano właściwości" #: FamilyView.php:536 GroupView.php:356 PersonView.php:655 PrintView.php:451 +======= +#: FamilyView.php:315 +msgid "Previous Family" +msgstr "Poprzednia Rodzina" + +#: FamilyView.php:323 +msgid "Next Family" +msgstr "Następna Rodzina" + +#: FamilyView.php:199 PersonView.php:197 +msgid "Upload Photo" +msgstr "Załaduj Zdjęcie" + +#: FamilyView.php:204 PersonView.php:201 +msgid "Delete Photo" +msgstr "Usuń Zdjęcie" + +#: FamilyView.php:455 +msgid "Pledges and Payments" +msgstr "Datki i Płatności" + +#: FamilyView.php:540 PersonView.php:647 PrintView.php:446 +msgid "No property assignments." +msgstr "Nie przypisano właściwości" + +#: FamilyView.php:549 GroupView.php:356 PersonView.php:655 PrintView.php:451 +>>>>>>> master #: PropertyAssign.php:180 SystemSettings.php:152 msgid "Value" msgstr "Wartość" +<<<<<<< HEAD #: FamilyView.php:539 FamilyView.php:577 GroupView.php:359 GroupView.php:395 msgid "Edit Value" msgstr "Edytuj Wartość" #: FamilyView.php:600 PersonView.php:688 +======= +#: FamilyView.php:552 FamilyView.php:590 GroupView.php:359 GroupView.php:395 +msgid "Edit Value" +msgstr "Edytuj Wartość" + +#: FamilyView.php:613 PersonView.php:688 +>>>>>>> master #, fuzzy msgid "Assign a New Property" msgstr "Przypisz Nowe Właściowści" +<<<<<<< HEAD #: FamilyView.php:618 GroupView.php:433 PersonView.php:724 PersonView.php:810 +======= +#: FamilyView.php:634 GroupView.php:433 PersonView.php:724 PersonView.php:810 +>>>>>>> master #: PropertyAssign.php:189 SelectList.php:1081 msgid "Assign" msgstr "Przypisz" +<<<<<<< HEAD #: FamilyView.php:640 msgid "Next payment date" msgstr "Data kolejnej Płatności" @@ -1763,11 +2114,52 @@ msgstr "Datek lub Płatność" #: AutoPaymentEditor.php:632 CanvassEditor.php:198 DepositSlipEditor.php:82 #: EditEventAttendees.php:33 FamilyView.php:748 FindFundRaiser.php:241 +======= +#: FamilyView.php:656 +msgid "Next payment date" +msgstr "Data kolejnej Płatności" + +#: FamilyView.php:658 +msgid "Interval (months)" +msgstr "Częstotliwość (miesiące)" + +#: FamilyView.php:662 FamilyView.php:773 SelectDelete.php:222 +msgid "Date Updated" +msgstr "Data Aktualizacji" + +#: FamilyView.php:663 FamilyView.php:774 SelectDelete.php:223 +msgid "Updated By" +msgstr "Zaktualizowane Przez" + +#: FamilyView.php:729 +msgid "Add a new automatic payment" +msgstr "Dodaj nową Automatyczną Płatność" + +#: FamilyView.php:741 +msgid "Show Pledges" +msgstr "Pokaż Datki" + +#: FamilyView.php:745 +msgid "Show Payments" +msgstr "Pokaż Płatności" + +#: FamilyView.php:754 MemberRoleChange.php:120 PropertyAssign.php:191 +msgid "Update" +msgstr "Aktualizuj" + +#: FamilyView.php:762 +msgid "Pledge or Payment" +msgstr "Datek lub Płatność" + +#: 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 "Data" +<<<<<<< HEAD #: FamilyView.php:750 msgid "NonDeductible" msgstr "Niepotrancalne" @@ -1797,6 +2189,37 @@ msgid " Canvass Entry" msgstr "Wpis Ankiety" #: DepositSlipEditor.php:223 FamilyView.php:880 FindDepositSlip.php:98 +======= +#: FamilyView.php:767 +msgid "NonDeductible" +msgstr "Niepotrancalne" + +#: FamilyView.php:768 SelectDelete.php:219 +msgid "Schedule" +msgstr "Termin" + +#: FamilyView.php:769 SelectDelete.php:220 +msgid "Method" +msgstr "Sposób" + +#: FamilyView.php:770 PledgeEditor.php:725 SelectDelete.php:221 +msgid "Comment" +msgstr "Komentarz" + +#: FamilyView.php:862 +msgid "Add a new pledge" +msgstr "Dodaj nowy Datek" + +#: FamilyView.php:864 +msgid "Add a new payment" +msgstr "Dodaj nową Płatność" + +#: FamilyView.php:875 +msgid " Canvass Entry" +msgstr "Wpis Ankiety" + +#: DepositSlipEditor.php:223 FamilyView.php:897 FindDepositSlip.php:98 +>>>>>>> master #: PersonView.php:897 PledgeDelete.php:23 msgid "Confirm Delete" msgstr "Potwiedź Usunięcie" @@ -2375,7 +2798,11 @@ msgstr "Ustawienia Dodatkowe dla Grupy" msgid "Disabled for this group." msgstr "Wyłącz dla tej Grupy." +<<<<<<< HEAD #: FamilyView.php:438 GroupView.php:342 PersonView.php:382 PrintView.php:435 +======= +#: FamilyView.php:449 GroupView.php:342 PersonView.php:382 PrintView.php:435 +>>>>>>> master #, fuzzy msgid "Assigned Properties" msgstr "Przypisane właściwości" @@ -2437,6 +2864,7 @@ msgstr "Nieprawidłowa Nazwa Użytkownika lub Hasło" msgid "Too many failed logins: your account has been locked. Please contact an administrator." msgstr "Zbyt wiele niepoprawnych logowań: twoje konto zostało zablokowane. Prosimy o kontakt z administratorem." +<<<<<<< HEAD #: Login.php:162 msgid "Please Login" msgstr "Prosimy się zalogować" @@ -2446,6 +2874,17 @@ msgid "Password" msgstr "Hasło" #: Login.php:150 Login.php:207 +======= +#: Login.php:159 +msgid "Please Login" +msgstr "Prosimy się zalogować" + +#: BackupDatabase.php:76 Login.php:184 UserList.php:56 +msgid "Password" +msgstr "Hasło" + +#: Login.php:147 Login.php:198 +>>>>>>> master msgid "Login" msgstr "Zaloguj" @@ -2457,8 +2896,13 @@ msgstr "Zarządzanie Kopertami" msgid "Update Family Records" msgstr "Aktualizuj Wpis Rodziny" +<<<<<<< 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 "Potwierdź" @@ -2527,7 +2971,11 @@ msgid "US Address Verification Report" msgstr "Raport Potwierdzający Adresy USA" #: 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" @@ -2872,7 +3320,11 @@ msgstr "Widok Wydruku" #: PrintView.php:325 Reports/CanvassReports.php:244 #: sundayschool/SundaySchoolClassView.php:201 +<<<<<<< HEAD #: sundayschool/SundaySchoolDashboard.php:184 +======= +#: sundayschool/SundaySchoolDashboard.php:196 +>>>>>>> master msgid "Age" msgstr "Wiek" @@ -2893,7 +3345,7 @@ msgstr "Notatki:" msgid "Entered:" msgstr "Wpisane:" -#: ChurchCRM/Service/TimelineService.php:124 PrintView.php:484 +#: ChurchCRM/Service/TimelineService.php:126 PrintView.php:484 msgid "by" msgstr "przez" @@ -3003,8 +3455,13 @@ msgid "Add a New Property Type" msgstr "Dodaj Nowy Typ Właściwości" #: 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 "Klasa" @@ -3198,7 +3655,11 @@ msgstr "Usuń Wpis Rodziny ORAZ Członków Rodziny" msgid "Person Listing" msgstr "Lista Osób" +<<<<<<< HEAD #: SelectList.php:184 menuconfig_mcf.php:12 +======= +#: SelectList.php:184 menuconfig_mcf.php:13 +>>>>>>> master msgid "Group Assignment Helper" msgstr "Asystem Przypiswyania Grup" @@ -3310,11 +3771,19 @@ msgstr "Rok Kalendarzowy" msgid "US Address Verification" msgstr "Weryfikacja Adresu USA" +<<<<<<< HEAD #: UserList.php:118 msgid "User Delete Confirmation" msgstr "Potwierdznie Usunięcia Użytkownika" #: UserList.php:120 +======= +#: UserList.php:121 +msgid "User Delete Confirmation" +msgstr "Potwierdznie Usunięcia Użytkownika" + +#: UserList.php:123 +>>>>>>> master msgid "Please confirm removal of user status from:" msgstr "Proszę potwierdzić usunięcie stanu użytkownika z:" @@ -3492,7 +3961,11 @@ msgstr "Nowe Hasło" msgid "Confirm New Password" msgstr "Potwierdź Nowe Hasło" +<<<<<<< HEAD #: UserList.php:163 +======= +#: UserList.php:166 +>>>>>>> master #, fuzzy msgid "Please confirm the password reset of this user" msgstr "Proszę potwierdzić zmianę hasła użytkownika" @@ -3825,8 +4298,13 @@ msgstr "Przewodniczący" msgid "City, State, Zip" msgstr "Miasto, Hrabstwo, Kod pocztowy" +<<<<<<< HEAD #: 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:40 FamilyEditor.php:787 +#: FamilyView.php:241 Reports/ConfirmReportEmail.php:144 +>>>>>>> master #: Reports/ConfirmReport.php:145 msgid "Send Newsletter" msgstr "Wyśli Newsletter" diff --git a/src/locale/pt_BR/LC_MESSAGES/messages.po b/src/locale/pt_BR/LC_MESSAGES/messages.po index c71150a7c0..b79c5f4ae5 100644 --- a/src/locale/pt_BR/LC_MESSAGES/messages.po +++ b/src/locale/pt_BR/LC_MESSAGES/messages.po @@ -21,8 +21,13 @@ msgstr "Confirmar apagar débito automático" #: DonationFundEditor.php:186 EditEventAttendees.php:76 #: ElectronicPaymentList.php:222 ElectronicPaymentList.php:288 #: EventNames.php:305 FamilyCustomFieldsEditor.php:334 +<<<<<<< HEAD #: FamilyCustomFieldsEditor.php:392 FamilyView.php:645 FamilyView.php:697 #: FamilyView.php:755 FamilyView.php:892 FindDepositSlip.php:108 +======= +#: FamilyCustomFieldsEditor.php:392 FamilyView.php:661 FamilyView.php:713 +#: FamilyView.php:772 FamilyView.php:909 FindDepositSlip.php:108 +>>>>>>> master #: FundRaiserEditor.php:204 ListEvents.php:250 PaddleNumList.php:60 #: PersonCustomFieldsEditor.php:318 PersonCustomFieldsEditor.php:387 #: PersonView.php:908 PledgeDelete.php:57 PropertyList.php:69 @@ -31,11 +36,19 @@ msgstr "Confirmar apagar débito automático" msgid "Delete" msgstr "Apagar" +<<<<<<< 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 @@ -43,17 +56,29 @@ msgstr "Apagar" #: 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 "Cancelar" +<<<<<<< HEAD #: AutoPaymentEditor.php:131 msgid "Automatic payment configuration for the " msgstr "Configuração de débito automático para " #: AutoPaymentEditor.php:582 CanvassEditor.php:242 DepositSlipEditor.php:98 +======= +#: AutoPaymentEditor.php:133 +msgid "Automatic payment configuration for the " +msgstr "Configuração de débito automático para " + +#: 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 @@ -66,6 +91,10 @@ msgstr "Configuração de débito automático para " msgid "Save" msgstr "Salvar" +<<<<<<< HEAD +======= +#: AutoPaymentEditor.php:808 BatchWinnerEntry.php:87 BatchWinnerEntry.php:99 +>>>>>>> master #: 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 @@ -77,6 +106,7 @@ msgstr "Salvar" msgid "Unassigned" msgstr "Não atribuido" +<<<<<<< HEAD #: AutoPaymentEditor.php:599 BatchWinnerEntry.php:87 BatchWinnerEntry.php:99 #: EditEventTypes.php:103 EventNames.php:109 EventNames.php:121 #: EventNames.php:166 GroupReports.php:52 GroupReports.php:147 @@ -97,27 +127,65 @@ msgid "Payment interval (months)" msgstr "Intervalo para pagamentos (meses)" #: AutoPaymentEditor.php:657 CartToGroup.php:80 EditEventTypes.php:91 +======= +#: AutoPaymentEditor.php:828 +msgid "Automatic payment type" +msgstr "Débito automático" + +#: AutoPaymentEditor.php:858 +msgid "Payment amount" +msgstr "Valor do pagamento" + +#: AutoPaymentEditor.php:863 +msgid "Payment interval (months)" +msgstr "Intervalo para pagamentos (meses)" + +#: AutoPaymentEditor.php:871 CartToGroup.php:80 EditEventTypes.php:91 +#: 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 "Nenhum" + +#: AutoPaymentEditor.php:884 +msgid "inactive" +msgstr "inativo" + +#: 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 "Cidade" +<<<<<<< HEAD +======= +#: 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 "Estado" +<<<<<<< HEAD +======= +#: 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 "País" +<<<<<<< HEAD #: AutoPaymentEditor.php:670 msgid "inactive" msgstr "inativo" #: AutoPaymentEditor.php:700 CartToFamily.php:249 CSVExport.php:115 +======= +#: 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 @@ -125,34 +193,56 @@ msgstr "inativo" msgid "Phone" msgstr "Telefone" +<<<<<<< HEAD +======= +#: 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 "e-mail" +<<<<<<< HEAD #: AutoPaymentEditor.php:705 CartToFamily.php:254 CSVExport.php:120 +======= +#: AutoPaymentEditor.php:952 ElectronicPaymentList.php:213 +>>>>>>> master #: FinancialReports.php:267 FindDepositSlip.php:52 PledgeEditor.php:592 msgid "Credit Card" msgstr "Cartão de crédito" +<<<<<<< HEAD #: AutoPaymentEditor.php:715 CartToFamily.php:274 CSVExport.php:135 +======= +#: AutoPaymentEditor.php:960 +>>>>>>> master #, fuzzy msgid "Vanco Credit Card Method" msgstr "Método de Cartão de Crédito pela Vanco" +<<<<<<< HEAD #: AutoPaymentEditor.php:745 msgid "Expiration Month" msgstr "Mês de validade" @@ -174,6 +264,29 @@ msgid "Bank Account Number" msgstr "Número da conta" #: AutoPaymentEditor.php:772 +======= +#: AutoPaymentEditor.php:969 +msgid "Expiration Month" +msgstr "Mês de validade" + +#: AutoPaymentEditor.php:975 +msgid "Expiration Year" +msgstr "Ano de validade" + +#: AutoPaymentEditor.php:981 +msgid "Bank Name" +msgstr "Nome do banco" + +#: AutoPaymentEditor.php:987 +msgid "Bank Route Number" +msgstr "Número da agência" + +#: AutoPaymentEditor.php:993 +msgid "Bank Account Number" +msgstr "Número da conta" + +#: AutoPaymentEditor.php:1001 +>>>>>>> master #, fuzzy msgid "Vanco Bank Account Method" msgstr "Método de Conta Bancária pela Vanco" @@ -260,10 +373,17 @@ msgstr "Exportar para CSV" msgid "Field Selection" msgstr "Seleção de Campo" +<<<<<<< HEAD #: AutoPaymentEditor.php:720 ChurchCRM/Reports/PDF_Directory.php:312 #: external/templates/registration/family-register-members.php:73 #: external/templates/verify/enter-info.php:25 ManageEnvelopes.php:166 #: PersonEditor.php:630 sundayschool/SundaySchoolDashboard.php:182 +======= +#: 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 +>>>>>>> master #, fuzzy msgid "Last Name" msgstr "Sobrenome" @@ -272,10 +392,17 @@ msgstr "Sobrenome" msgid "Required" msgstr "Requerido" +<<<<<<< HEAD #: AutoPaymentEditor.php:725 CartToFamily.php:315 CartView.php:288 #: external/templates/registration/family-register-members.php:69 #: external/templates/verify/enter-info.php:21 PersonEditor.php:608 #: sundayschool/SundaySchoolDashboard.php:181 +======= +#: 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 +>>>>>>> master #, fuzzy msgid "First Name" msgstr "Primeiro Nome" @@ -285,7 +412,11 @@ msgstr "Primeiro Nome" msgid "Middle Name" msgstr "Nome do meio" +<<<<<<< HEAD #: AutoPaymentEditor.php:730 ElectronicPaymentList.php:213 +======= +#: 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 @@ -322,7 +453,11 @@ msgstr "Data de nascimento" msgid "Age / Years Married" msgstr "Tempo de casado" +<<<<<<< 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 #, fuzzy msgid "Family Role" @@ -472,9 +607,15 @@ msgstr "Envelope de doação" #: 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 @@ -484,8 +625,13 @@ msgid "Home Phone" msgstr "Telefone residencial" #: 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 @@ -493,8 +639,13 @@ msgid "Work Phone" msgstr "Telefone Comercial" #: 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" @@ -506,13 +657,22 @@ msgstr "Outro e-mail" #: 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 "Data de aniversário" #: 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 "Data de casamento" @@ -544,7 +704,11 @@ msgstr "Nota: Separadores (hífens, etc.) ou falta deles não faz diferença" msgid "Default country if none specified otherwise" msgstr "País padrão, se nenhum for especificado" +<<<<<<< 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" @@ -775,11 +939,19 @@ msgstr "Não foi digitado nenhum nome de Família!" msgid "Add Cart to Family" msgstr "Adicionar Carrinho a uma Família" +<<<<<<< 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 #: EventNames.php:266 FamilyCustomFieldsEditor.php:330 #: FamilyCustomFieldsEditor.php:444 FamilyList.php:43 FamilyView.php:535 +======= +#: 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:330 +#: FamilyCustomFieldsEditor.php:444 FamilyList.php:43 FamilyView.php:548 +>>>>>>> master #: GeoPage.php:385 GroupEditor.php:77 GroupPropsFormEditor.php:284 #: GroupPropsFormEditor.php:396 GroupView.php:321 GroupView.php:355 #: PersonCustomFieldsEditor.php:314 PersonCustomFieldsEditor.php:445 @@ -861,19 +1033,27 @@ msgstr "Adicione ao grupo" msgid "Create a New Group" msgstr "Criar novo grupo" -#: CartView.php:42 +#: CartView.php:41 msgid "View Your Cart" msgstr "Veja seu Carrinho" -#: CartView.php:50 +#: CartView.php:49 msgid "You have no items in your cart." msgstr "Não há items no seu Carrinho." +<<<<<<< HEAD #: CartView.php:59 msgid "Back to Menu" msgstr "Retornar ao menu" #: CartView.php:94 +======= +#: CartView.php:58 +msgid "Back to Menu" +msgstr "Retornar ao menu" + +#: CartView.php:93 +>>>>>>> master msgid "Go To Labels" msgstr "Ir para Etiquetas" @@ -881,6 +1061,7 @@ msgstr "Ir para Etiquetas" msgid "Empty Cart" msgstr "Esvaziar carrinho" +<<<<<<< HEAD #: CartView.php:113 Include/Header.php:131 msgid "Empty Cart to Group" msgstr "Esvaziar carrinho em um grupo" @@ -890,6 +1071,17 @@ msgid "Empty Cart to Family" msgstr "Esvaziar carrinho em uma Família" #: CartView.php:121 Include/Header.php:141 +======= +#: CartView.php:114 Include/Header.php:131 +msgid "Empty Cart to Group" +msgstr "Esvaziar carrinho em um grupo" + +#: CartView.php:120 Include/Header.php:136 +msgid "Empty Cart to Family" +msgstr "Esvaziar carrinho em uma Família" + +#: CartView.php:124 Include/Header.php:141 +>>>>>>> master msgid "Empty Cart to Event" msgstr "Esvaziar carrinho em um evento" @@ -897,7 +1089,11 @@ msgstr "Esvaziar carrinho em um evento" msgid "Map Cart" msgstr "Mapa carrinho" +<<<<<<< HEAD #: CartView.php:129 +======= +#: CartView.php:135 +>>>>>>> master #, fuzzy msgid "Name Tags" msgstr "Nome" @@ -906,11 +1102,16 @@ msgstr "Nome" msgid "Email Cart" msgstr "E-mail Carrinho" +<<<<<<< HEAD #: CartView.php:164 GroupView.php:205 +======= +#: CartView.php:170 GroupView.php:205 +>>>>>>> master #: sundayschool/SundaySchoolClassView.php:100 msgid "Email (BCC)" msgstr "E-mail (Cco)" +<<<<<<< HEAD #: CartView.php:193 msgid "Create Directory From Cart" msgstr "Criar diretório a partir do Carrinho" @@ -937,17 +1138,53 @@ msgstr "pessoas de" #: 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:200 +msgid "Create Directory From Cart" +msgstr "Criar diretório a partir do Carrinho" + +#: CartView.php:224 CartView.php:266 +msgid "Generate Labels" +msgstr "Criar etiquetas" + +#: CartView.php:232 +msgid "Bulk Mail Presort" +msgstr "Bulk Mail classificar previamente" + +#: CartView.php:241 +msgid "Quiet Presort" +msgstr "Classificar previamente tranquila" + +#: CartView.php:287 +msgid "Your cart contains" +msgstr "Seu Carrinho contém" + +#: CartView.php:287 +msgid "persons from" +msgstr "pessoas de" + +#: 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 "Remover" +<<<<<<< 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 "Sim" +<<<<<<< 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" @@ -1003,7 +1240,11 @@ msgstr "Selecione o evento ao qual as pessoas serão adicionadas" msgid "Select Event" msgstr "Selecione o evento" +<<<<<<< HEAD #: external/templates/verify/verify-family-info.php:140 +======= +#: external/templates/verify/verify-family-info.php:150 +>>>>>>> master msgid "Verify" msgstr "Verificar" @@ -1044,16 +1285,28 @@ msgstr "Ação" msgid "No Attendees Assigned to Event" msgstr "Não há pessoas incluidas neste evento" +<<<<<<< HEAD #: Checkin.php:480 Include/Functions.php:1658 Reports/CanvassReports.php:245 +======= +#: Checkin.php:472 Include/Functions.php:1658 Reports/CanvassReports.php:245 +>>>>>>> master #: Reports/VotingMembers.php:88 queryparameteroptions_qpo.php:15 msgid "Member" msgstr "Membro" +<<<<<<< HEAD #: Checkin.php:482 ChurchCRM/Service/PersonService.php:38 msgid " of the" msgstr " da" #: Checkin.php:484 ChurchCRM/Service/PersonService.php:40 PersonView.php:267 +======= +#: Checkin.php:474 ChurchCRM/Service/PersonService.php:38 +msgid " of the" +msgstr " da" + +#: Checkin.php:476 ChurchCRM/Service/PersonService.php:40 PersonView.php:267 +>>>>>>> master msgid "(No assigned family)" msgstr "(Nenhuma família atribuída)" @@ -1138,21 +1391,35 @@ msgstr "Quem é filho?" msgid "Information to Include" msgstr "Informações para incluir" +<<<<<<< HEAD #: AutoPaymentEditor.php:737 #: CartToFamily.php:244 CartView.php:287 CSVExport.php:105 CSVExport.php:110 +======= +#: 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 "Endereço" #: 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" @@ -1162,7 +1429,11 @@ msgstr "Aniversário" msgid "Family Home Phone" msgstr "Telefone residencial da família" +<<<<<<< HEAD #: ChurchCRM/tasks/FamilyWorkPhoneTask.php:30 DirectoryReports.php:181 +======= +#: DirectoryReports.php:181 +>>>>>>> master msgid "Family Work Phone" msgstr "Telefone do trabalho da família" @@ -1171,7 +1442,11 @@ msgid "Family Cell Phone" msgstr "Celular da família" #: 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 "e-mail da família" @@ -1383,11 +1658,19 @@ msgstr "Lista de Pagamentos Eletrônicos" msgid "Add a New Electronic Payment Method" msgstr "Adicionar um Novo Método de Pagamento Eletrônico" +<<<<<<< HEAD #: AutoPaymentEditor.php:685 CSVExport.php:79 CSVImport.php:217 #: 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 @@ -1396,7 +1679,11 @@ msgid "Family" msgstr "Família" #: ElectronicPaymentList.php:199 FamilyCustomFieldsEditor.php:329 +<<<<<<< HEAD #: FamilyCustomFieldsEditor.php:431 FamilyView.php:534 FamilyView.php:639 +======= +#: FamilyCustomFieldsEditor.php:431 FamilyView.php:547 FamilyView.php:655 +>>>>>>> master #: 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 @@ -1404,7 +1691,11 @@ msgstr "Família" msgid "Type" msgstr "Tipo" +<<<<<<< HEAD #: AutoPaymentEditor.php:680 CSVExport.php:90 CSVImport.php:215 +======= +#: 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" @@ -1414,7 +1705,11 @@ msgstr "Ano fiscal" msgid "Next Date" msgstr "Próxima Data" +<<<<<<< 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 "Quantia" @@ -1423,8 +1718,13 @@ msgstr "Quantia" msgid "Interval" msgstr "Intervalo" +<<<<<<< HEAD #: AutoPaymentEditor.php:710 BackupDatabase.php:67 CartToFamily.php:266 #: FamilyView.php:746 FinancialReports.php:305 SelectDelete.php:215 +======= +#: AutoPaymentEditor.php:868 ElectronicPaymentList.php:204 FamilyView.php:659 +#: FamilyView.php:763 FinancialReports.php:305 SelectDelete.php:215 +>>>>>>> master msgid "Fund" msgstr "Fundos" @@ -1460,8 +1760,13 @@ msgid "Vanco CC" msgstr "Vanco CC" #: 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 @@ -1796,7 +2101,11 @@ msgid "Custom Fields" msgstr "Campos personalizados" #: 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 "Membros da Família" @@ -1818,7 +2127,11 @@ msgstr "Meio" msgid "Last" msgstr "Final" +<<<<<<< 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" @@ -1897,7 +2210,11 @@ msgstr "Dezembro" msgid "Unk" msgstr "Desconhecido" +<<<<<<< HEAD #: FamilyList.php:29 FamilyView.php:312 +======= +#: FamilyList.php:29 FamilyView.php:319 +>>>>>>> master #, fuzzy msgid "Family List" msgstr "Lista de Famílias" @@ -1907,7 +2224,11 @@ msgid "Add Family" msgstr " Adicionar Família" #: ChurchCRM/model/ChurchCRM/Person.php:103 FamilyEditor.php:436 +<<<<<<< HEAD #: FamilyList.php:48 Menu.php:205 PersonEditor.php:380 +======= +#: FamilyList.php:48 Menu.php:211 PersonEditor.php:380 +>>>>>>> master msgid "Created" msgstr "Criada" @@ -1919,6 +2240,7 @@ msgstr "Editada" msgid "Family View" msgstr "Detalhes Cadastrais da Família" +<<<<<<< HEAD #: FamilyView.php:226 msgid " of church
    " msgstr " da igreja
    " @@ -1928,10 +2250,22 @@ msgid "Latitude/Longitude" msgstr "Latitude/Longitude" #: FamilyEditor.php:881 FamilyView.php:249 ManageEnvelopes.php:170 +======= +#: FamilyView.php:230 +msgid " of church
    " +msgstr " da igreja
    " + +#: FamilyView.php:236 +msgid "Latitude/Longitude" +msgstr "Latitude/Longitude" + +#: FamilyEditor.php:881 FamilyView.php:254 ManageEnvelopes.php:170 +>>>>>>> master #: PledgeEditor.php:528 msgid "Envelope Number" msgstr "Número do envelope" +<<<<<<< HEAD #: FamilyView.php:302 msgid "Verify Info" msgstr "Verificar Informação" @@ -1985,24 +2319,92 @@ msgid "No property assignments." msgstr "Não há propriedades atribuídas." #: FamilyView.php:536 GroupView.php:356 PersonView.php:655 PrintView.php:451 +======= +#: FamilyView.php:309 +msgid "Verify Info" +msgstr "Verificar Informação" + +#: FamilyView.php:311 +msgid "Add New Member" +msgstr "Adicionar um novo Membro" + +#: FamilyView.php:315 +msgid "Previous Family" +msgstr "Família anterior" + +#: FamilyView.php:323 +msgid "Next Family" +msgstr "Próxima Família" + +#: FamilyView.php:329 +msgid "Delete this Family" +msgstr "Apagar esta Família" + +#: FamilyView.php:199 PersonView.php:197 +msgid "Upload Photo" +msgstr "Upload de foto" + +#: FamilyView.php:204 PersonView.php:201 +msgid "Delete Photo" +msgstr "apagar foto" + +#: FamilyView.php:338 PersonView.php:353 +msgid "Add a Note" +msgstr "Adicionar uma anotação" + +#: FamilyView.php:343 +msgid "Add All Family Members to Cart" +msgstr "Adicionar Todos os Membros da Família ao Carrinho" + +#: FamilyView.php:447 PersonView.php:379 +msgid "Timeline" +msgstr "Linha do Tempo" + +#: FamilyView.php:453 +msgid "Automatic Payments" +msgstr "Pagamentos Automáticos" + +#: FamilyView.php:455 +msgid "Pledges and Payments" +msgstr "Promessas e Pagamentos" + +#: FamilyView.php:540 PersonView.php:647 PrintView.php:446 +msgid "No property assignments." +msgstr "Não há propriedades atribuídas." + +#: FamilyView.php:549 GroupView.php:356 PersonView.php:655 PrintView.php:451 +>>>>>>> master #: PropertyAssign.php:180 SystemSettings.php:152 msgid "Value" msgstr "Valor" +<<<<<<< HEAD #: FamilyView.php:539 FamilyView.php:577 GroupView.php:359 GroupView.php:395 msgid "Edit Value" msgstr "Editar valor" #: FamilyView.php:600 PersonView.php:688 +======= +#: FamilyView.php:552 FamilyView.php:590 GroupView.php:359 GroupView.php:395 +msgid "Edit Value" +msgstr "Editar valor" + +#: FamilyView.php:613 PersonView.php:688 +>>>>>>> master #, fuzzy msgid "Assign a New Property" msgstr " Atribuir uma nova propriedade" +<<<<<<< HEAD #: FamilyView.php:618 GroupView.php:433 PersonView.php:724 PersonView.php:810 +======= +#: FamilyView.php:634 GroupView.php:433 PersonView.php:724 PersonView.php:810 +>>>>>>> master #: PropertyAssign.php:189 SelectList.php:1081 msgid "Assign" msgstr "Atribuir" +<<<<<<< HEAD #: FamilyView.php:640 msgid "Next payment date" msgstr "data do próximo pagamento" @@ -2032,10 +2434,42 @@ msgid "Show Payments" msgstr "Mostra pagamentos" #: FamilyView.php:730 +======= +#: FamilyView.php:656 +msgid "Next payment date" +msgstr "data do próximo pagamento" + +#: FamilyView.php:658 +msgid "Interval (months)" +msgstr "Intervalo (meses)" + +#: FamilyView.php:662 FamilyView.php:773 SelectDelete.php:222 +msgid "Date Updated" +msgstr "Data de atualização" + +#: FamilyView.php:663 FamilyView.php:774 SelectDelete.php:223 +msgid "Updated By" +msgstr "Atualizado por" + +#: FamilyView.php:729 +msgid "Add a new automatic payment" +msgstr "Incluir novo débito automático" + +#: FamilyView.php:741 +msgid "Show Pledges" +msgstr "Mostra promessas" + +#: FamilyView.php:745 +msgid "Show Payments" +msgstr "Mostra pagamentos" + +#: FamilyView.php:746 +>>>>>>> master #, fuzzy msgid "Since" msgstr "Desde" +<<<<<<< HEAD #: FamilyView.php:738 MemberRoleChange.php:120 PropertyAssign.php:191 msgid "Update" msgstr "Atualização" @@ -2046,11 +2480,24 @@ msgstr "Promessa ou pagamento" #: AutoPaymentEditor.php:690 AutoPaymentEditor.php:695 CartToFamily.php:239 #: EditEventAttendees.php:33 FamilyView.php:748 FindFundRaiser.php:241 +======= +#: FamilyView.php:754 MemberRoleChange.php:120 PropertyAssign.php:191 +msgid "Update" +msgstr "Atualização" + +#: FamilyView.php:762 +msgid "Pledge or Payment" +msgstr "Promessa ou pagamento" + +#: 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 "Data" +<<<<<<< HEAD #: FamilyView.php:750 msgid "NonDeductible" msgstr "Não dedutivel" @@ -2076,6 +2523,33 @@ msgid "Add a new payment" msgstr "Incluir novo pagamento" #: FamilyView.php:858 +======= +#: FamilyView.php:767 +msgid "NonDeductible" +msgstr "Não dedutivel" + +#: FamilyView.php:768 SelectDelete.php:219 +msgid "Schedule" +msgstr "Agendamentos" + +#: FamilyView.php:769 SelectDelete.php:220 +msgid "Method" +msgstr "Método" + +#: FamilyView.php:770 PledgeEditor.php:725 SelectDelete.php:221 +msgid "Comment" +msgstr "Comentário" + +#: FamilyView.php:862 +msgid "Add a new pledge" +msgstr "Incluir nova promessa" + +#: FamilyView.php:864 +msgid "Add a new payment" +msgstr "Incluir novo pagamento" + +#: FamilyView.php:875 +>>>>>>> master msgid " Canvass Entry" msgstr " Entrada de Visitadores" @@ -2084,11 +2558,16 @@ msgstr " Entrada de Visitadores" msgid "Close" msgstr "Fechar" +<<<<<<< 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 "Confirma exclusão" +<<<<<<< HEAD #: FamilyView.php:884 PersonView.php:901 msgid "You are about to delete the profile photo, this procedure is irreversible." msgstr "Você está prestes a apagar a foto do perfil, esse procedimento é irreversível." @@ -2110,6 +2589,29 @@ msgid "We could not find the family you were looking for.
    Meanwhile, you may" msgstr "Nós não conseguimos encontrar a família que você estava procurando.
    Enquanto isso, você pode" #: FamilyView.php:951 PersonView.php:1013 +======= +#: FamilyView.php:901 PersonView.php:901 +msgid "You are about to delete the profile photo, this procedure is irreversible." +msgstr "Você está prestes a apagar a foto do perfil, esse procedimento é irreversível." + +#: FamilyView.php:903 PersonView.php:903 +msgid "Do you want to proceed?" +msgstr "Você quer continuar?" + +#: FamilyView.php:930 +msgid "You are about to email copy of the family information in pdf to the following emails" +msgstr "Você está prestes a enviar e-mail com cópia das informações da família em pdf para os seguintes e-mails" + +#: FamilyView.php:967 +msgid "Oops! Family not found." +msgstr "Opa! Família não encontrada." + +#: FamilyView.php:970 +msgid "We could not find the family you were looking for.
    Meanwhile, you may" +msgstr "Nós não conseguimos encontrar a família que você estava procurando.
    Enquanto isso, você pode" + +#: FamilyView.php:971 PersonView.php:1007 +>>>>>>> master msgid "return to member dashboard" msgstr "retornar ao painel de membros" @@ -2797,7 +3299,11 @@ msgstr "Propriedades especificas do grupo" msgid "Disabled for this group." msgstr "Desativada para este grupo." +<<<<<<< HEAD #: FamilyView.php:438 GroupView.php:342 PersonView.php:382 PrintView.php:435 +======= +#: FamilyView.php:449 GroupView.php:342 PersonView.php:382 PrintView.php:435 +>>>>>>> master #, fuzzy msgid "Assigned Properties" msgstr "Propriedades atribuídas" @@ -2895,6 +3401,7 @@ msgstr "Login ou senha inválidos" msgid "Too many failed logins: your account has been locked. Please contact an administrator." msgstr "Muitos não logins: sua conta foi bloqueada. Entre em contato com um administrador." +<<<<<<< HEAD #: Login.php:162 msgid "Please Login" msgstr "Por favor faça o login" @@ -2908,6 +3415,21 @@ msgid "Password" msgstr "Senha" #: Login.php:150 Login.php:207 +======= +#: Login.php:159 +msgid "Please Login" +msgstr "Por favor faça o login" + +#: ChurchCRM/Emails/users/BaseUserEmail.php:30 Login.php:179 +msgid "Email/Username" +msgstr "E-mail/Usuário" + +#: BackupDatabase.php:76 Login.php:184 UserList.php:56 +msgid "Password" +msgstr "Senha" + +#: Login.php:147 Login.php:198 +>>>>>>> master msgid "Login" msgstr "Login" @@ -2924,8 +3446,13 @@ msgstr "Adicionar nova Família" msgid "Update Envelopes" msgstr "Atualizar Envelopes" +<<<<<<< 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 #, fuzzy msgid "Confirm" @@ -3113,26 +3640,46 @@ msgid "Latest Families" msgstr "Últimas Famílias" #: 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 "Nome da Família" +<<<<<<< HEAD #: Menu.php:231 msgid "Updated Families" msgstr "Famílias Atualizadas" #: ChurchCRM/model/ChurchCRM/Person.php:108 FamilyEditor.php:471 Menu.php:240 +======= +#: Menu.php:237 +msgid "Updated Families" +msgstr "Famílias Atualizadas" + +#: ChurchCRM/model/ChurchCRM/Person.php:108 FamilyEditor.php:471 Menu.php:252 +>>>>>>> master #: PersonEditor.php:384 msgid "Updated" msgstr "Atualizado" +<<<<<<< HEAD #: Menu.php:268 msgid "Latest Members" msgstr "Membros mais Recentes" #: Menu.php:303 +======= +#: Menu.php:280 +msgid "Latest Members" +msgstr "Membros mais Recentes" + +#: Menu.php:315 +>>>>>>> master msgid "Updated Members" msgstr "Membros Atualizados" @@ -3431,11 +3978,19 @@ msgstr "Atribuir uma nova oportunidade de voluntariado" msgid "Are you sure you want to remove this person from the Group" msgstr "Você está certo de que deseja remover esta pessoa do Grupo" +<<<<<<< HEAD #: PersonView.php:1010 msgid "Oops! Person not found." msgstr "Ops! Pessoa não encontrada." #: PersonView.php:1013 +======= +#: PersonView.php:1004 +msgid "Oops! Person not found." +msgstr "Ops! Pessoa não encontrada." + +#: PersonView.php:1007 +>>>>>>> master msgid "We could not find the person you were looking for.
    Meanwhile, you may" msgstr "Nós não conseguimos encontrar a pessoa que você estava procurando.
    Enquanto isso, você pode" @@ -3568,7 +4123,11 @@ msgstr "Versão para impressão" #: PrintView.php:325 Reports/CanvassReports.php:244 #: sundayschool/SundaySchoolClassView.php:201 +<<<<<<< HEAD #: sundayschool/SundaySchoolDashboard.php:184 +======= +#: sundayschool/SundaySchoolDashboard.php:196 +>>>>>>> master msgid "Age" msgstr "idade" @@ -3589,7 +4148,7 @@ msgstr "Notas:" msgid "Entered:" msgstr " Atribuído:" -#: ChurchCRM/Service/TimelineService.php:124 PrintView.php:484 +#: ChurchCRM/Service/TimelineService.php:126 PrintView.php:484 msgid "by" msgstr "por" @@ -3699,8 +4258,13 @@ msgid "Add a New Property Type" msgstr "Crie um novo tipo de propriedade" #: 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 "Classe" @@ -3908,7 +4472,11 @@ msgstr "Remove a família e todos os membros" msgid "Person Listing" msgstr "Lista pessoas" +<<<<<<< HEAD #: SelectList.php:184 menuconfig_mcf.php:12 +======= +#: SelectList.php:184 menuconfig_mcf.php:13 +>>>>>>> master msgid "Group Assignment Helper" msgstr "Ajudante Atribuição de grupo" @@ -4021,14 +4589,21 @@ msgstr "Definir permissão verdadeira para dar novos usuários a capacidade de a msgid "Permission" msgstr "Pessoa" +<<<<<<< HEAD #: AutoPaymentEditor.php:596 +======= +>>>>>>> master #: Register.php:53 #, fuzzy msgid "Base URL" msgstr "URL base" +<<<<<<< HEAD #: AutoPaymentEditor.php:637 ElectronicPaymentList.php:200 FamilyView.php:747 #: ChurchCRM/dto/SystemConfig.php:221 Include/Footer.php:144 +======= +#: ChurchCRM/dto/SystemConfig.php:222 Include/Footer.php:144 +>>>>>>> master #: SystemSettings.php:43 msgid "System Settings" msgstr "Configurações do Sistema" @@ -4050,11 +4625,19 @@ msgstr "EUA verificação de endereço" msgid "Update Latitude & Longitude" msgstr "Atualizar Latitude e Longiude" +<<<<<<< HEAD #: UserList.php:118 msgid "User Delete Confirmation" msgstr "Confirmação de remoção de usuário" #: UserList.php:120 +======= +#: UserList.php:121 +msgid "User Delete Confirmation" +msgstr "Confirmação de remoção de usuário" + +#: UserList.php:123 +>>>>>>> master msgid "Please confirm removal of user status from:" msgstr "Por favor, confirme a remoção do status de usuário de:" @@ -4243,7 +4826,11 @@ msgstr "Nova senha" msgid "Confirm New Password" msgstr "Confirme a nova senha" +<<<<<<< HEAD #: UserList.php:163 +======= +#: UserList.php:166 +>>>>>>> master #, fuzzy msgid "Please confirm the password reset of this user" msgstr "Confirma reset de senha deste usuário" @@ -4572,7 +5159,10 @@ msgstr "Itálico" msgid " Bold" msgstr "Negrito" +<<<<<<< HEAD #: AutoPaymentEditor.php:654 ElectronicPaymentList.php:204 FamilyView.php:643 +======= +>>>>>>> master #: Include/Header-function.php:73 msgid "Issue Report!" msgstr "Reportar Questão!" @@ -4603,7 +5193,11 @@ msgstr "Algumas informações gerais sobre o seu sistema vai serão enviadas jun msgid "No personally identifiable information will be submitted unless you purposefully include it." msgstr "Nenhuma informação pessoal identificável será submetida a menos que você inclua-a propositadamente." +<<<<<<< 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 "Painel" @@ -4724,8 +5318,13 @@ msgstr "Ligação" msgid "City, State, Zip" msgstr "Cidade, Estado, CEP" +<<<<<<< HEAD #: 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:40 FamilyEditor.php:787 +#: FamilyView.php:241 Reports/ConfirmReportEmail.php:144 +>>>>>>> master #: Reports/ConfirmReport.php:145 msgid "Send Newsletter" msgstr "Enviar newsletter" @@ -4884,7 +5483,11 @@ msgid "Gift Designation:" msgstr "Designação de presente:" #: sundayschool/SundaySchoolClassView.php:38 +<<<<<<< HEAD #: sundayschool/SundaySchoolDashboard.php:226 menuconfig_mcf.php:13 +======= +#: sundayschool/SundaySchoolDashboard.php:238 menuconfig_mcf.php:14 +>>>>>>> master #, fuzzy msgid "Sunday School" msgstr "Escola Bíblica Dominical" @@ -4904,7 +5507,11 @@ msgstr "Ver Histórico" #: sundayschool/SundaySchoolClassView.php:120 #: sundayschool/SundaySchoolDashboard.php:80 +<<<<<<< HEAD #: sundayschool/SundaySchoolDashboard.php:146 +======= +#: sundayschool/SundaySchoolDashboard.php:152 +>>>>>>> master msgid "Teachers" msgstr "Professores" @@ -4927,7 +5534,11 @@ msgstr "Aniversariantes por Mês" #: sundayschool/SundaySchoolClassView.php:191 #: sundayschool/SundaySchoolDashboard.php:91 +<<<<<<< HEAD #: sundayschool/SundaySchoolDashboard.php:147 +======= +#: sundayschool/SundaySchoolDashboard.php:153 +>>>>>>> master msgid "Students" msgstr "Alunos" @@ -4936,9 +5547,15 @@ msgstr "Alunos" msgid "Mobile" msgstr "Celular" +<<<<<<< HEAD #: external/templates/verify/verify-family-info.php:25 #: sundayschool/SundaySchoolClassView.php:205 #: sundayschool/SundaySchoolDashboard.php:185 +======= +#: external/templates/verify/verify-family-info.php:26 +#: sundayschool/SundaySchoolClassView.php:205 +#: sundayschool/SundaySchoolDashboard.php:197 +>>>>>>> master msgid "Home Address" msgstr "Endereço Residencial" @@ -5014,7 +5631,11 @@ msgstr "Gerar controle de freqüências às aulas" msgid "Export All Classes, Kids, and Parent to CSV file" msgstr "Exportar Todas as Classes, Crianças e Pais para um arquivo CSV" +<<<<<<< HEAD #: sundayschool/SundaySchoolDashboard.php:173 +======= +#: sundayschool/SundaySchoolDashboard.php:179 +>>>>>>> master msgid "Students not in a Sunday School Class" msgstr "Alunos sem Classe na Escola Bíblica Dominical" @@ -5112,7 +5733,11 @@ msgstr "Ver Todas as Famílias" msgid "Events" msgstr "Eventos" +<<<<<<< HEAD #: FundRaiserEditor.php:35 menuconfig_mcf.php:25 +======= +#: FundRaiserEditor.php:35 menuconfig_mcf.php:26 +>>>>>>> master msgid "Fundraiser" msgstr "Campanha" @@ -5267,6 +5892,7 @@ msgstr "Faça o Login para restaurar o Banco de Dados" msgid "Restore Error." msgstr "Erro de Restauração" +<<<<<<< HEAD #: ChurchCRM/dto/SystemConfig.php:214 msgid "Church Information" msgstr "Informações da Igreja" @@ -5292,6 +5918,33 @@ msgid "Report Settings" msgstr "Configurações de Relatórios" #: ChurchCRM/dto/SystemConfig.php:223 +======= +#: ChurchCRM/dto/SystemConfig.php:215 +msgid "Church Information" +msgstr "Informações da Igreja" + +#: ChurchCRM/dto/SystemConfig.php:216 +msgid "User setup" +msgstr "Configuração do usuário" + +#: ChurchCRM/dto/SystemConfig.php:217 +msgid "Email Setup" +msgstr "Configuração de e-mail" + +#: ChurchCRM/dto/SystemConfig.php:218 +msgid "Member Setup" +msgstr "Configurações do Membro" + +#: ChurchCRM/dto/SystemConfig.php:219 +msgid "Map Settings" +msgstr "Configurações do Mapa" + +#: ChurchCRM/dto/SystemConfig.php:220 +msgid "Report Settings" +msgstr "Configurações de Relatórios" + +#: ChurchCRM/dto/SystemConfig.php:224 +>>>>>>> master msgid "Localization" msgstr "Localização" @@ -5431,12 +6084,21 @@ msgstr "Adicionar uma nova Classe" msgid "Export to CSV" msgstr "Exportar para CSV" +<<<<<<< HEAD #: sundayschool/SundaySchoolDashboard.php:226 #: sundayschool/SundaySchoolDashboard.php:239 msgid "Add" msgstr "Adicionar" #: sundayschool/SundaySchoolDashboard.php:231 +======= +#: sundayschool/SundaySchoolDashboard.php:238 +#: sundayschool/SundaySchoolDashboard.php:251 +msgid "Add" +msgstr "Adicionar" + +#: sundayschool/SundaySchoolDashboard.php:243 +>>>>>>> master msgid "Enter Name" msgstr "Inserir o Nome" @@ -5581,11 +6243,19 @@ msgstr "Limpar Todos os Fundos" msgid "Deposit Comment" msgstr "Comentário do Depósito" +<<<<<<< HEAD #: Login.php:167 msgid "Your previous session timed out. Please login again." msgstr "A sua sessão anterior expirou. Por favor faça o login outra vez." #: Login.php:214 +======= +#: Login.php:164 +msgid "Your previous session timed out. Please login again." +msgstr "A sua sessão anterior expirou. Por favor faça o login outra vez." + +#: Login.php:206 +>>>>>>> master msgid "Register a new Family" msgstr "Registre uma nova família" @@ -5717,7 +6387,11 @@ msgstr "Visitador:" msgid "Add Attendees for Event" msgstr "Adicionar Participantes ao Evento" +<<<<<<< HEAD #: Checkin.php:482 ChurchCRM/Service/PersonService.php:38 +======= +#: Checkin.php:474 ChurchCRM/Service/PersonService.php:38 +>>>>>>> master msgid "family" msgstr "família" @@ -5816,7 +6490,10 @@ msgstr "mês de idade" msgid "yr old" msgstr "anos de idade" +<<<<<<< HEAD #: AutoPaymentEditor.php:632 CanvassEditor.php:198 DepositSlipEditor.php:82 +======= +>>>>>>> master #: IntegrityCheck.php:61 msgid "File Name" msgstr "Nome o Arquivo" @@ -5830,7 +6507,11 @@ msgstr "Todos" msgid "Family Map" msgstr "Mapa da Família" +<<<<<<< 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 "Grupos" @@ -7934,10 +8615,6 @@ msgstr "O nome da Igreja está configurado com o valor padrão" msgid "SMTP Server info are blank" msgstr "Informação do servidor SMTP em branco" -#: ChurchCRM/tasks/FamilyWorkPhoneTask.php:35 -msgid "In Church CRM 2.6.0 we will no longer support a work phone for a family" -msgstr "No ChurchCRM 2.6.0 nós não suportaremos um telefone de trabalho para uma família" - #: ChurchCRM/tasks/HttpsTask.php:21 msgid "Your system could be more secure by installing an TLS/SSL Cert." msgstr "O seu sistema podria ser mais seguro com a instalação de um certificado TLS/SSL." @@ -8001,22 +8678,23 @@ msgstr "Por favor, digite a informação a seguir para iniciar a verificação d msgid "email" msgstr "e-mail" -#: external/templates/verify/verify-family-info.php:7 +#: external/templates/verify/verify-family-info.php:8 msgid "Family Verification" msgstr "Verificação da Família" -#: external/templates/verify/verify-family-info.php:47 +#: external/templates/verify/verify-family-info.php:51 msgid "Family Member(s)" msgstr "Membro(s) da Família" -#: external/templates/verify/verify-family-info.php:74 +#: external/templates/verify/verify-family-info.php:83 msgid "Work Email" msgstr "E-mail de Trabalho" -#: external/templates/verify/verify-family-info.php:77 +#: external/templates/verify/verify-family-info.php:87 msgid "Age Hidden" msgstr "Idade Oculta" +<<<<<<< HEAD #: external/templates/verify/verify-family-info.php:126 msgid "Please let us know what information to update if any" msgstr "Por favor, nos deixe saber quais informações atualizar se houver" @@ -8050,6 +8728,41 @@ msgid "PDF Report" msgstr "Relatório PDF" #: FamilyView.php:935 +======= +#: external/templates/verify/verify-family-info.php:136 +msgid "Please let us know what information to update if any" +msgstr "Por favor, nos deixe saber quais informações atualizar se houver" + +#: external/templates/verify/verify-family-info.php:141 +msgid "Your verification request is complete" +msgstr "Seu pedido de verificação está completo" + +#: external/templates/verify/verify-family-info.php:145 +msgid "We encountered an error submitting with your verification data" +msgstr "Encontramos um erro ao enviar os seus dados de verificação" + +#: external/templates/verify/verify-family-info.php:151 +msgid "Visit our Site" +msgstr "Visite nosso site" + +#: FamilyView.php:923 +msgid "Request Family Info Verification" +msgstr "Solicitar Confirmação de Informações da Família" + +#: FamilyView.php:926 +msgid "Select how do you want to request the family information to be verified" +msgstr "Selecione como deseja solicitar que as informações da família sejam verificadas" + +#: FamilyView.php:947 +msgid "Online Verification" +msgstr "Verificação On-line" + +#: FamilyView.php:952 +msgid "PDF Report" +msgstr "Relatório PDF" + +#: FamilyView.php:954 +>>>>>>> master msgid "Verified In Person" msgstr "Verificada na Pessoa" @@ -8245,7 +8958,11 @@ msgstr "Família desativada" msgid "Activated the Family" msgstr "Família ativa" +<<<<<<< HEAD #: CartView.php:280 Include/Functions.php:121 +======= +#: CartView.php:287 Include/Functions.php:121 +>>>>>>> master msgid "families" msgstr "Famílias" @@ -8253,6 +8970,7 @@ msgstr "Famílias" msgid "Deposit ticket type. QBDT - Quickbooks" msgstr "Tipo de ingresso de depósito. QBDT - Quickbooks" +<<<<<<< HEAD #: ChurchCRM/dto/SystemConfig.php:220 msgid "Financial Settings" msgstr "Configurações financeiras" @@ -8263,6 +8981,18 @@ msgid "An invalid configuration name has been requested" msgstr "Um nome de configuração inválido foi solicitado" #: ChurchCRM/dto/SystemConfig.php:317 +======= +#: ChurchCRM/dto/SystemConfig.php:221 +msgid "Financial Settings" +msgstr "Configurações financeiras" + +#: ChurchCRM/dto/SystemConfig.php:275 ChurchCRM/dto/SystemConfig.php:287 +#: ChurchCRM/dto/SystemConfig.php:300 +msgid "An invalid configuration name has been requested" +msgstr "Um nome de configuração inválido foi solicitado" + +#: ChurchCRM/dto/SystemConfig.php:318 +>>>>>>> master msgid "An invalid configuration id has been requested" msgstr "Um ID de configuração inválido foi solicitado" @@ -8283,6 +9013,7 @@ msgstr "Por favor, assegure-se que é isso que você pretende fazer. " msgid " This Family is Deactivated" msgstr "Esta Família está Desativada" +<<<<<<< HEAD #: FamilyView.php:343 msgid " this Family" msgstr "esta família" @@ -8300,6 +9031,25 @@ msgid "Please confirm deactivation of family" msgstr "Por favor, confirme a desativação da família" #: FamilyView.php:972 +======= +#: FamilyView.php:349 +msgid " this Family" +msgstr "esta família" + +#: FamilyView.php:988 +msgid "Confirm Deactivation" +msgstr "Confirme a Desativação" + +#: FamilyView.php:988 +msgid "Confirm Activation" +msgstr "Confirme a ativação" + +#: FamilyView.php:990 +msgid "Please confirm deactivation of family" +msgstr "Por favor, confirme a desativação da família" + +#: FamilyView.php:993 +>>>>>>> master msgid "Please confirm activation of family" msgstr "Por favor, confirme a ativação da família" @@ -8331,7 +9081,11 @@ msgstr "Remova do carrinho" msgid "Family Member" msgstr "Membro da Família" +<<<<<<< HEAD #: FamilyView.php:606 PersonView.php:696 QueryView.php:322 +======= +#: FamilyView.php:619 PersonView.php:696 QueryView.php:322 +>>>>>>> master msgid "select an option" msgstr "selecione uma opção" @@ -8457,11 +9211,19 @@ msgstr "Conta desbloqueada" msgid "Part" msgstr "Parte" +<<<<<<< HEAD #: FamilyView.php:193 PersonView.php:194 msgid "View Photo" msgstr "Ver foto" #: FamilyView.php:1026 +======= +#: FamilyView.php:195 PersonView.php:194 +msgid "View Photo" +msgstr "Ver foto" + +#: FamilyView.php:1046 +>>>>>>> master msgid "Family Photo" msgstr "Foto da Família" @@ -8509,7 +9271,11 @@ msgstr "Legenda" msgid "assigned" msgstr "Assinatura" +<<<<<<< HEAD #: PersonView.php:990 +======= +#: PersonView.php:984 +>>>>>>> master msgid "Photo" msgstr "Foto" @@ -8529,6 +9295,7 @@ msgstr "Mostrando alunos com aniversários em" msgid "Actions" msgstr "Ações" +<<<<<<< HEAD #: UserList.php:140 UserList.php:161 msgid "Action Confirmation" msgstr "Ação de confirmação" @@ -8541,6 +9308,28 @@ msgstr "Confirme a contagem de login com falha de reset" msgid "Password reset for" msgstr "Senha resetada para" +======= +#: UserList.php:143 UserList.php:164 +msgid "Action Confirmation" +msgstr "Ação de confirmação" + +#: UserList.php:145 +msgid "Please confirm reset failed login count" +msgstr "Confirme a contagem de login com falha de reset" + +#: UserList.php:176 +msgid "Password reset for" +msgstr "Senha resetada para" + +#: menuconfig_mcf.php:9 +msgid "View Active Families" +msgstr "Ver família ativas" + +#: menuconfig_mcf.php:10 +msgid "View Inactive Families" +msgstr "Ver família inativas" + +>>>>>>> master #: ChurchCRM/dto/SystemConfig.php:101 msgid "SMTP Server timeout in sec" msgstr "Timeout do servidor SMTP" @@ -8733,11 +9522,19 @@ msgstr "Visibilidade da Hora no Quiosque" msgid "Show/Hide Lost Password Link on the login screen" msgstr "Mostrar/Esconder Link da senha perdida na tela de login" +<<<<<<< HEAD #: ChurchCRM/dto/SystemConfig.php:222 msgid "Backup" msgstr "Bacape" #: ChurchCRM/dto/SystemConfig.php:224 +======= +#: ChurchCRM/dto/SystemConfig.php:223 +msgid "Backup" +msgstr "Bacape" + +#: ChurchCRM/dto/SystemConfig.php:225 +>>>>>>> master msgid "Integration" msgstr "Integração" @@ -8803,7 +9600,11 @@ msgstr "Uma nova senha foi enviada para você. Por favor cheque seu e-mail." #: Include/Footer.php:199 KioskManager.php:21 KioskManager.php:29 msgid "Kiosk Manager" +<<<<<<< HEAD msgstr "Gerenciador de quiosuqe" +======= +msgstr "Gerenciador de quiosque" +>>>>>>> master #: Include/Header.php:107 msgid "Your Cart" @@ -8837,7 +9638,11 @@ msgstr "Abilitar o requistro de um novo quiosque" msgid "Active Kiosks" msgstr "Quiosques ativo" +<<<<<<< HEAD #: Login.php:192 +======= +#: Login.php:190 +>>>>>>> master msgid "I forgot my password" msgstr "Eu esqueci a minha senha" @@ -8845,3 +9650,50 @@ msgstr "Eu esqueci a minha senha" msgid "Attendees Checked In" msgstr "Participantes Checados" +<<<<<<< HEAD +======= +#: AutoPaymentEditor.php:133 +msgid " family" +msgstr " família" + +#: AutoPaymentEditor.php:832 +msgid "Bank Draft " +msgstr "Cheque Administrativo " + +#: AutoPaymentEditor.php:836 +msgid "Credit Card " +msgstr "Cartão de Crédito " + +#: AutoPaymentEditor.php:840 +msgid "Disable " +msgstr "Desabilitado " + +#: AutoPaymentEditor.php:1018 +msgid "Store Private Data at Vanco" +msgstr "Armazenar dados Privativos no Vanco" + +#: CartView.php:106 +msgid "Cart Functions" +msgstr "Funções do Carrinho" + +#: CartView.php:195 +msgid "Text Cart" +msgstr "Texto do Carrinho" + +#: ChurchCRM/dto/SystemConfig.php:208 +msgid "Your Church's Website" +msgstr "O Website da Sua Igreja" + +#: ChurchCRM/Service/TimelineService.php:118 +msgid "Self Verification" +msgstr "Autoverificação" + +#: FamilyView.php:349 +msgid "Deactivate" +msgstr "Desativar" + +#: FamilyView.php:349 +msgid "Activate" +msgstr "Ativar" + +>>>>>>> master diff --git a/src/locale/ro_RO/LC_MESSAGES/messages.po b/src/locale/ro_RO/LC_MESSAGES/messages.po index 76e6832870..4ffb6b801f 100644 --- a/src/locale/ro_RO/LC_MESSAGES/messages.po +++ b/src/locale/ro_RO/LC_MESSAGES/messages.po @@ -21,8 +21,13 @@ msgstr "Confirmare ștergere de plata automata" #: DonationFundEditor.php:186 EditEventAttendees.php:76 #: ElectronicPaymentList.php:222 ElectronicPaymentList.php:288 #: EventNames.php:305 FamilyCustomFieldsEditor.php:334 +<<<<<<< HEAD #: FamilyCustomFieldsEditor.php:392 FamilyView.php:645 FamilyView.php:697 #: FamilyView.php:755 FamilyView.php:892 FindDepositSlip.php:108 +======= +#: FamilyCustomFieldsEditor.php:392 FamilyView.php:661 FamilyView.php:713 +#: FamilyView.php:772 FamilyView.php:909 FindDepositSlip.php:108 +>>>>>>> master #: FundRaiserEditor.php:204 ListEvents.php:250 PaddleNumList.php:60 #: PersonCustomFieldsEditor.php:318 PersonCustomFieldsEditor.php:387 #: PersonView.php:908 PledgeDelete.php:57 PropertyList.php:69 @@ -31,11 +36,19 @@ msgstr "Confirmare ștergere de plata automata" msgid "Delete" msgstr "Șterge" +<<<<<<< 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 @@ -43,17 +56,29 @@ msgstr "Șterge" #: 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 "Anula" +<<<<<<< HEAD #: AutoPaymentEditor.php:131 msgid "Automatic payment configuration for the " msgstr "Configurare de plată automată pentru" #: AutoPaymentEditor.php:582 CanvassEditor.php:242 DepositSlipEditor.php:98 +======= +#: AutoPaymentEditor.php:133 +msgid "Automatic payment configuration for the " +msgstr "Configurare de plată automată pentru" + +#: 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 @@ -66,7 +91,11 @@ msgstr "Configurare de plată automată pentru" msgid "Save" msgstr "Salva" +<<<<<<< HEAD #: AutoPaymentEditor.php:599 BatchWinnerEntry.php:87 BatchWinnerEntry.php:99 +======= +#: AutoPaymentEditor.php:808 BatchWinnerEntry.php:87 BatchWinnerEntry.php:99 +>>>>>>> master #: 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 @@ -78,6 +107,7 @@ msgstr "Salva" msgid "Unassigned" msgstr "Neatribuit" +<<<<<<< HEAD #: AutoPaymentEditor.php:619 msgid "Automatic payment type" msgstr "Tipul de plată automată" @@ -91,36 +121,71 @@ msgid "Payment interval (months)" msgstr "Intervalul de plată (luni)" #: AutoPaymentEditor.php:657 CartToGroup.php:80 EditEventTypes.php:91 +======= +#: AutoPaymentEditor.php:828 +msgid "Automatic payment type" +msgstr "Tipul de plată automată" + +#: AutoPaymentEditor.php:858 +msgid "Payment amount" +msgstr "Suma de plată" + +#: AutoPaymentEditor.php:863 +msgid "Payment interval (months)" +msgstr "Intervalul de plată (luni)" + +#: 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 "Nici unul" +<<<<<<< HEAD #: AutoPaymentEditor.php:670 msgid "inactive" msgstr "inactiv" #: AutoPaymentEditor.php:700 CartToFamily.php:249 CSVExport.php:115 +======= +#: AutoPaymentEditor.php:884 +msgid "inactive" +msgstr "inactiv" + +#: 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 "Oraș" +<<<<<<< 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 "De stat" +<<<<<<< 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 "Țară" +<<<<<<< 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 @@ -128,30 +193,48 @@ msgstr "Țară" msgid "Phone" msgstr "Telefon" +<<<<<<< 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 "E-mail" +<<<<<<< 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 "Card de credit" +<<<<<<< HEAD #: AutoPaymentEditor.php:745 msgid "Expiration Month" msgstr "Expirare Luna" @@ -169,6 +252,25 @@ msgid "Bank Route Number" msgstr "Numarul Route bancă" #: AutoPaymentEditor.php:765 +======= +#: AutoPaymentEditor.php:969 +msgid "Expiration Month" +msgstr "Expirare Luna" + +#: AutoPaymentEditor.php:975 +msgid "Expiration Year" +msgstr "Anul expirării" + +#: AutoPaymentEditor.php:981 +msgid "Bank Name" +msgstr "Numele băncii" + +#: AutoPaymentEditor.php:987 +msgid "Bank Route Number" +msgstr "Numarul Route bancă" + +#: AutoPaymentEditor.php:993 +>>>>>>> master msgid "Bank Account Number" msgstr "Numărul de cont bancar" @@ -234,10 +336,17 @@ msgstr "Introduceți Câștigătorii" msgid "CSV Export" msgstr "CSV Export" +<<<<<<< HEAD #: AutoPaymentEditor.php:685 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:182 +======= +#: 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 +>>>>>>> master #, fuzzy msgid "Last Name" msgstr "Nume" @@ -246,10 +355,17 @@ msgstr "Nume" msgid "Required" msgstr "Necesar" +<<<<<<< HEAD #: AutoPaymentEditor.php:680 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:181 +======= +#: 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 +>>>>>>> master #, fuzzy msgid "First Name" msgstr "Prenume" @@ -287,7 +403,11 @@ msgstr "Nasterii / Aniversare Data" msgid "Age / Years Married" msgstr "Vârsta / ani Casatorit" +<<<<<<< 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 #, fuzzy msgid "Family Role" @@ -433,9 +553,15 @@ msgstr "Plic donație" #: 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 @@ -445,8 +571,13 @@ msgid "Home Phone" msgstr "Telefon acasă" #: 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 @@ -454,8 +585,13 @@ msgid "Work Phone" msgstr "Telefon serviciu" #: 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" @@ -467,13 +603,22 @@ msgstr "Munca / Alte e-mail" #: 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 "Data nașterii" #: 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 "Nunta Data" @@ -505,7 +650,11 @@ msgstr "NOTĂ: Separatore (linii, etc) sau lipsa acestora nu contează" msgid "Default country if none specified otherwise" msgstr "Țară implicit dacă nu se specifică altfel" +<<<<<<< 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" @@ -700,11 +849,19 @@ msgstr "Nici un nume de familie a intrat!" msgid "Add Cart to Family" msgstr "Adauga in cos pentru a Familiei" +<<<<<<< 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 #: EventNames.php:266 FamilyCustomFieldsEditor.php:330 #: FamilyCustomFieldsEditor.php:444 FamilyList.php:43 FamilyView.php:535 +======= +#: 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:330 +#: FamilyCustomFieldsEditor.php:444 FamilyList.php:43 FamilyView.php:548 +>>>>>>> master #: GeoPage.php:385 GroupEditor.php:77 GroupPropsFormEditor.php:284 #: GroupPropsFormEditor.php:396 GroupView.php:321 GroupView.php:355 #: PersonCustomFieldsEditor.php:314 PersonCustomFieldsEditor.php:445 @@ -786,19 +943,27 @@ msgstr "Adauga la grup" msgid "Create a New Group" msgstr "Creați un grup nou" -#: CartView.php:42 +#: CartView.php:41 msgid "View Your Cart" msgstr "Vezi Cosul" -#: CartView.php:50 +#: CartView.php:49 msgid "You have no items in your cart." msgstr "Nu ai nici un produs in cos." +<<<<<<< HEAD #: CartView.php:59 msgid "Back to Menu" msgstr "Inapoi la Meniu" #: CartView.php:94 +======= +#: CartView.php:58 +msgid "Back to Menu" +msgstr "Inapoi la Meniu" + +#: CartView.php:93 +>>>>>>> master msgid "Go To Labels" msgstr "Du-te la etichete" @@ -806,6 +971,7 @@ msgstr "Du-te la etichete" msgid "Empty Cart" msgstr "Gol Cart" +<<<<<<< HEAD #: CartView.php:113 Include/Header.php:131 msgid "Empty Cart to Group" msgstr "Coșul de grup" @@ -815,6 +981,17 @@ msgid "Empty Cart to Family" msgstr "Coșul de familie" #: CartView.php:121 Include/Header.php:141 +======= +#: CartView.php:114 Include/Header.php:131 +msgid "Empty Cart to Group" +msgstr "Coșul de grup" + +#: CartView.php:120 Include/Header.php:136 +msgid "Empty Cart to Family" +msgstr "Coșul de familie" + +#: CartView.php:124 Include/Header.php:141 +>>>>>>> master msgid "Empty Cart to Event" msgstr "Coșul la Eveniment" @@ -822,7 +999,11 @@ msgstr "Coșul la Eveniment" msgid "Map Cart" msgstr "Harta Cart" +<<<<<<< HEAD #: CartView.php:129 +======= +#: CartView.php:135 +>>>>>>> master msgid "Name Tags" msgstr "Ecusoane" @@ -830,11 +1011,16 @@ msgstr "Ecusoane" msgid "Email Cart" msgstr "E-mail Cosul" +<<<<<<< HEAD #: CartView.php:164 GroupView.php:205 +======= +#: CartView.php:170 GroupView.php:205 +>>>>>>> master #: sundayschool/SundaySchoolClassView.php:100 msgid "Email (BCC)" msgstr "E-mail (CCA)" +<<<<<<< HEAD #: CartView.php:193 msgid "Create Directory From Cart" msgstr "Creați director din coș" @@ -861,17 +1047,53 @@ msgstr "persoane din" #: 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:200 +msgid "Create Directory From Cart" +msgstr "Creați director din coș" + +#: CartView.php:224 CartView.php:266 +msgid "Generate Labels" +msgstr "Genera Etichete" + +#: CartView.php:232 +msgid "Bulk Mail Presort" +msgstr "Bulk Mail Presort" + +#: CartView.php:241 +msgid "Quiet Presort" +msgstr "Presort liniștit" + +#: CartView.php:287 +msgid "Your cart contains" +msgstr "Cosul de cumparaturi contine" + +#: CartView.php:287 +msgid "persons from" +msgstr "persoane din" + +#: 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 "Îndepărta" +<<<<<<< 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 "Da" +<<<<<<< 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" @@ -890,7 +1112,11 @@ msgstr "Selectați evenimentul la care doriți să verificați de persoane din p msgid "Select Event" msgstr "Selectați Eveniment" +<<<<<<< HEAD #: external/templates/verify/verify-family-info.php:140 +======= +#: external/templates/verify/verify-family-info.php:150 +>>>>>>> master msgid "Verify" msgstr "Verifica" @@ -931,16 +1157,28 @@ msgstr "Acțiune" msgid "No Attendees Assigned to Event" msgstr "Nu Participanți alocate la Eveniment" +<<<<<<< HEAD #: Checkin.php:480 Include/Functions.php:1658 Reports/CanvassReports.php:245 +======= +#: Checkin.php:472 Include/Functions.php:1658 Reports/CanvassReports.php:245 +>>>>>>> master #: Reports/VotingMembers.php:88 queryparameteroptions_qpo.php:15 msgid "Member" msgstr "Membru" +<<<<<<< HEAD #: Checkin.php:482 ChurchCRM/Service/PersonService.php:38 msgid " of the" msgstr "de" #: Checkin.php:484 ChurchCRM/Service/PersonService.php:40 PersonView.php:267 +======= +#: Checkin.php:474 ChurchCRM/Service/PersonService.php:38 +msgid " of the" +msgstr "de" + +#: Checkin.php:476 ChurchCRM/Service/PersonService.php:40 PersonView.php:267 +>>>>>>> master msgid "(No assigned family)" msgstr "(Nicio familie alocate)" @@ -1017,21 +1255,35 @@ msgstr "Ce rol este un copil?" msgid "Information to Include" msgstr "Informații pentru a include" +<<<<<<< HEAD #: AutoPaymentEditor.php:690 AutoPaymentEditor.php:695 CartToFamily.php:239 #: CartToFamily.php:244 CartView.php:287 CSVExport.php:105 CSVExport.php:110 +======= +#: 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 "Adresa" #: 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" @@ -1041,7 +1293,11 @@ msgstr "Zi de naștere" msgid "Family Home Phone" msgstr "Familia telefon acasă" +<<<<<<< HEAD #: ChurchCRM/tasks/FamilyWorkPhoneTask.php:30 DirectoryReports.php:181 +======= +#: DirectoryReports.php:181 +>>>>>>> master msgid "Family Work Phone" msgstr "Familia de lucru Telefon" @@ -1050,7 +1306,11 @@ msgid "Family Cell Phone" msgstr "Familia telefon mobil" #: 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 "E-mail familie" @@ -1237,11 +1497,19 @@ msgstr "Model Recurrance" msgid "Attendance Counts" msgstr "Numără participare" +<<<<<<< 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 @@ -1250,7 +1518,11 @@ msgid "Family" msgstr "Familie" #: ElectronicPaymentList.php:199 FamilyCustomFieldsEditor.php:329 +<<<<<<< HEAD #: FamilyCustomFieldsEditor.php:431 FamilyView.php:534 FamilyView.php:639 +======= +#: FamilyCustomFieldsEditor.php:431 FamilyView.php:547 FamilyView.php:655 +>>>>>>> master #: 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 @@ -1258,19 +1530,32 @@ msgstr "Familie" msgid "Type" msgstr "Tip" +<<<<<<< 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 "Exercițiu financiar" +<<<<<<< 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 "Valoare" +<<<<<<< HEAD #: AutoPaymentEditor.php:654 ElectronicPaymentList.php:204 FamilyView.php:643 #: FamilyView.php:746 FinancialReports.php:305 SelectDelete.php:215 +======= +#: AutoPaymentEditor.php:868 ElectronicPaymentList.php:204 FamilyView.php:659 +#: FamilyView.php:763 FinancialReports.php:305 SelectDelete.php:215 +>>>>>>> master msgid "Fund" msgstr "Fond" @@ -1289,8 +1574,13 @@ msgid "Year" msgstr "An" #: 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 @@ -1555,7 +1845,11 @@ msgid "Custom Fields" msgstr "Câmpuri personalizate" #: 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 "Membrii de familie" @@ -1576,7 +1870,11 @@ msgstr "De mijloc" msgid "Last" msgstr "Trecut" +<<<<<<< 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" @@ -1659,15 +1957,24 @@ msgstr "UNK" msgid "Family View" msgstr "Vezi familie" +<<<<<<< HEAD #: FamilyView.php:232 msgid "Latitude/Longitude" msgstr "Latitudine / Longitudine" #: FamilyEditor.php:881 FamilyView.php:249 ManageEnvelopes.php:170 +======= +#: FamilyView.php:236 +msgid "Latitude/Longitude" +msgstr "Latitudine / Longitudine" + +#: FamilyEditor.php:881 FamilyView.php:254 ManageEnvelopes.php:170 +>>>>>>> master #: PledgeEditor.php:528 msgid "Envelope Number" msgstr "Numărul de plic" +<<<<<<< HEAD #: FamilyView.php:308 msgid "Previous Family" msgstr "Familia anterior" @@ -1693,24 +2000,64 @@ msgid "No property assignments." msgstr "Nu misiuni de proprietate." #: FamilyView.php:536 GroupView.php:356 PersonView.php:655 PrintView.php:451 +======= +#: FamilyView.php:315 +msgid "Previous Family" +msgstr "Familia anterior" + +#: FamilyView.php:323 +msgid "Next Family" +msgstr "Următor de familie" + +#: FamilyView.php:199 PersonView.php:197 +msgid "Upload Photo" +msgstr "Încarcă foto" + +#: FamilyView.php:204 PersonView.php:201 +msgid "Delete Photo" +msgstr "Ștergeți Foto" + +#: FamilyView.php:455 +msgid "Pledges and Payments" +msgstr "Angajamente și plăți" + +#: FamilyView.php:540 PersonView.php:647 PrintView.php:446 +msgid "No property assignments." +msgstr "Nu misiuni de proprietate." + +#: FamilyView.php:549 GroupView.php:356 PersonView.php:655 PrintView.php:451 +>>>>>>> master #: PropertyAssign.php:180 SystemSettings.php:152 msgid "Value" msgstr "Valoare" +<<<<<<< HEAD #: FamilyView.php:539 FamilyView.php:577 GroupView.php:359 GroupView.php:395 msgid "Edit Value" msgstr "Editare Valoare" #: FamilyView.php:600 PersonView.php:688 +======= +#: FamilyView.php:552 FamilyView.php:590 GroupView.php:359 GroupView.php:395 +msgid "Edit Value" +msgstr "Editare Valoare" + +#: FamilyView.php:613 PersonView.php:688 +>>>>>>> master #, fuzzy msgid "Assign a New Property" msgstr "Atribui o nouă proprietate" +<<<<<<< HEAD #: FamilyView.php:618 GroupView.php:433 PersonView.php:724 PersonView.php:810 +======= +#: FamilyView.php:634 GroupView.php:433 PersonView.php:724 PersonView.php:810 +>>>>>>> master #: PropertyAssign.php:189 SelectList.php:1081 msgid "Assign" msgstr "Atribui" +<<<<<<< HEAD #: FamilyView.php:640 msgid "Next payment date" msgstr "Urmatoarea data de plata" @@ -1749,11 +2096,52 @@ msgstr "Gaj sau plata" #: AutoPaymentEditor.php:632 CanvassEditor.php:198 DepositSlipEditor.php:82 #: EditEventAttendees.php:33 FamilyView.php:748 FindFundRaiser.php:241 +======= +#: FamilyView.php:656 +msgid "Next payment date" +msgstr "Urmatoarea data de plata" + +#: FamilyView.php:658 +msgid "Interval (months)" +msgstr "Interval (luni)" + +#: FamilyView.php:662 FamilyView.php:773 SelectDelete.php:222 +msgid "Date Updated" +msgstr "Data actualizării" + +#: FamilyView.php:663 FamilyView.php:774 SelectDelete.php:223 +msgid "Updated By" +msgstr "Actualizat de" + +#: FamilyView.php:729 +msgid "Add a new automatic payment" +msgstr "Adauga un nou plată automată" + +#: FamilyView.php:741 +msgid "Show Pledges" +msgstr "Prezinte angajamentele" + +#: FamilyView.php:745 +msgid "Show Payments" +msgstr "Arata Plăți" + +#: FamilyView.php:754 MemberRoleChange.php:120 PropertyAssign.php:191 +msgid "Update" +msgstr "Actualizare" + +#: FamilyView.php:762 +msgid "Pledge or Payment" +msgstr "Gaj sau plata" + +#: 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 "Data" +<<<<<<< HEAD #: FamilyView.php:750 msgid "NonDeductible" msgstr "Nedeductibile" @@ -1783,6 +2171,37 @@ msgid " Canvass Entry" msgstr "Propagandă electorală de intrare" #: DepositSlipEditor.php:223 FamilyView.php:880 FindDepositSlip.php:98 +======= +#: FamilyView.php:767 +msgid "NonDeductible" +msgstr "Nedeductibile" + +#: FamilyView.php:768 SelectDelete.php:219 +msgid "Schedule" +msgstr "Programa" + +#: FamilyView.php:769 SelectDelete.php:220 +msgid "Method" +msgstr "Metodă" + +#: FamilyView.php:770 PledgeEditor.php:725 SelectDelete.php:221 +msgid "Comment" +msgstr "Comentariu" + +#: FamilyView.php:862 +msgid "Add a new pledge" +msgstr "Adauga un nou angajament" + +#: FamilyView.php:864 +msgid "Add a new payment" +msgstr "Adauga un nou plată" + +#: FamilyView.php:875 +msgid " Canvass Entry" +msgstr "Propagandă electorală de intrare" + +#: DepositSlipEditor.php:223 FamilyView.php:897 FindDepositSlip.php:98 +>>>>>>> master #: PersonView.php:897 PledgeDelete.php:23 msgid "Confirm Delete" msgstr "Confirmați ștergerea" @@ -2361,7 +2780,11 @@ msgstr "Proprietăți grup-specifice" msgid "Disabled for this group." msgstr "Dezactivată pentru acest grup." +<<<<<<< HEAD #: FamilyView.php:438 GroupView.php:342 PersonView.php:382 PrintView.php:435 +======= +#: FamilyView.php:449 GroupView.php:342 PersonView.php:382 PrintView.php:435 +>>>>>>> master #, fuzzy msgid "Assigned Properties" msgstr "Proprietăți atribuite" @@ -2423,6 +2846,7 @@ msgstr "Invalid login sau parola" msgid "Too many failed logins: your account has been locked. Please contact an administrator." msgstr "Prea mulți datele de conectare nu a reușit: contul dvs. a fost blocat. Vă rugăm să contactați un administrator." +<<<<<<< HEAD #: Login.php:162 msgid "Please Login" msgstr "Logheaza-te" @@ -2432,6 +2856,17 @@ msgid "Password" msgstr "Parolă" #: Login.php:150 Login.php:207 +======= +#: Login.php:159 +msgid "Please Login" +msgstr "Logheaza-te" + +#: BackupDatabase.php:76 Login.php:184 UserList.php:56 +msgid "Password" +msgstr "Parolă" + +#: Login.php:147 Login.php:198 +>>>>>>> master msgid "Login" msgstr "Login" @@ -2443,8 +2878,13 @@ msgstr "Plic Manager de" msgid "Update Family Records" msgstr "Actualizare Records Family" +<<<<<<< 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 "Confirma" @@ -2513,7 +2953,11 @@ msgid "US Address Verification Report" msgstr "SUA Raportul de verificare Adresa" #: 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" @@ -2858,7 +3302,11 @@ msgstr "Vedere imprimanta" #: PrintView.php:325 Reports/CanvassReports.php:244 #: sundayschool/SundaySchoolClassView.php:201 +<<<<<<< HEAD #: sundayschool/SundaySchoolDashboard.php:184 +======= +#: sundayschool/SundaySchoolDashboard.php:196 +>>>>>>> master msgid "Age" msgstr "Vârstă" @@ -2879,7 +3327,7 @@ msgstr "Note:" msgid "Entered:" msgstr "Au intrat:" -#: ChurchCRM/Service/TimelineService.php:124 PrintView.php:484 +#: ChurchCRM/Service/TimelineService.php:126 PrintView.php:484 msgid "by" msgstr "de" @@ -2989,8 +3437,13 @@ msgid "Add a New Property Type" msgstr "Adauga un nou tip de proprietate" #: 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 "Clasă" @@ -3179,7 +3632,11 @@ msgstr "Șterge livret de familie și membrii familiilor" msgid "Person Listing" msgstr "Listarea persoană" +<<<<<<< HEAD #: SelectList.php:184 menuconfig_mcf.php:12 +======= +#: SelectList.php:184 menuconfig_mcf.php:13 +>>>>>>> master msgid "Group Assignment Helper" msgstr "Grupa Helper Temă" @@ -3291,11 +3748,19 @@ msgstr "An calendaristic" msgid "US Address Verification" msgstr "SUA Adresa de verificare" +<<<<<<< HEAD #: UserList.php:118 msgid "User Delete Confirmation" msgstr "Ștergere utilizator Confirmarea" #: UserList.php:120 +======= +#: UserList.php:121 +msgid "User Delete Confirmation" +msgstr "Ștergere utilizator Confirmarea" + +#: UserList.php:123 +>>>>>>> master msgid "Please confirm removal of user status from:" msgstr "Vă rugăm să confirmați eliminarea stării de utilizator de la:" @@ -3456,7 +3921,11 @@ msgstr "Vechi Parola" msgid "Confirm New Password" msgstr "Confirmați noua parolă" +<<<<<<< HEAD #: UserList.php:163 +======= +#: UserList.php:166 +>>>>>>> master #, fuzzy msgid "Please confirm the password reset of this user" msgstr "Vă rugăm să confirmați resetare a parolei de acest utilizator" @@ -3784,8 +4253,13 @@ msgstr "Legătură" msgid "City, State, Zip" msgstr "Oras, de stat, Zip" +<<<<<<< HEAD #: 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:40 FamilyEditor.php:787 +#: FamilyView.php:241 Reports/ConfirmReportEmail.php:144 +>>>>>>> master #: Reports/ConfirmReport.php:145 msgid "Send Newsletter" msgstr "Trimite Newsletter" diff --git a/src/locale/ru_RU/LC_MESSAGES/messages.po b/src/locale/ru_RU/LC_MESSAGES/messages.po index b5d800dfa6..a5e234ea72 100644 --- a/src/locale/ru_RU/LC_MESSAGES/messages.po +++ b/src/locale/ru_RU/LC_MESSAGES/messages.po @@ -21,8 +21,13 @@ msgstr "Подтвердить Удалить Автоматическая оп #: DonationFundEditor.php:186 EditEventAttendees.php:76 #: ElectronicPaymentList.php:222 ElectronicPaymentList.php:288 #: EventNames.php:305 FamilyCustomFieldsEditor.php:334 +<<<<<<< HEAD #: FamilyCustomFieldsEditor.php:392 FamilyView.php:645 FamilyView.php:697 #: FamilyView.php:755 FamilyView.php:892 FindDepositSlip.php:108 +======= +#: FamilyCustomFieldsEditor.php:392 FamilyView.php:661 FamilyView.php:713 +#: FamilyView.php:772 FamilyView.php:909 FindDepositSlip.php:108 +>>>>>>> master #: FundRaiserEditor.php:204 ListEvents.php:250 PaddleNumList.php:60 #: PersonCustomFieldsEditor.php:318 PersonCustomFieldsEditor.php:387 #: PersonView.php:908 PledgeDelete.php:57 PropertyList.php:69 @@ -31,11 +36,19 @@ msgstr "Подтвердить Удалить Автоматическая оп 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 @@ -43,17 +56,29 @@ 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: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 @@ -66,7 +91,11 @@ msgstr "Автоматическая настройка оплата " msgid "Save" msgstr "Сохранить" +<<<<<<< HEAD #: AutoPaymentEditor.php:599 BatchWinnerEntry.php:87 BatchWinnerEntry.php:99 +======= +#: AutoPaymentEditor.php:808 BatchWinnerEntry.php:87 BatchWinnerEntry.php:99 +>>>>>>> master #: 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 @@ -78,6 +107,7 @@ msgstr "Сохранить" msgid "Unassigned" msgstr "Не назначен" +<<<<<<< HEAD #: AutoPaymentEditor.php:619 msgid "Automatic payment type" msgstr "Автоматический способ оплаты" @@ -91,36 +121,71 @@ msgid "Payment interval (months)" msgstr "Интервал Оплата (месяцев)" #: AutoPaymentEditor.php:657 CartToGroup.php:80 EditEventTypes.php:91 +======= +#: AutoPaymentEditor.php:828 +msgid "Automatic payment type" +msgstr "Автоматический способ оплаты" + +#: AutoPaymentEditor.php:858 +msgid "Payment amount" +msgstr "Сумма платежа" + +#: AutoPaymentEditor.php:863 +msgid "Payment interval (months)" +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 "неактивно" #: AutoPaymentEditor.php:700 CartToFamily.php:249 CSVExport.php:115 +======= +#: AutoPaymentEditor.php:884 +msgid "inactive" +msgstr "неактивно" + +#: 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: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 @@ -128,30 +193,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:745 msgid "Expiration Month" msgstr "Месяц истечения" @@ -169,6 +252,25 @@ msgid "Bank Route Number" msgstr "Банк маршрут №" #: AutoPaymentEditor.php:765 +======= +#: 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 +>>>>>>> master msgid "Bank Account Number" msgstr "Номер банковского счета" @@ -234,10 +336,17 @@ msgstr "Введите победителей" msgid "CSV Export" msgstr "CSV экспорт" +<<<<<<< HEAD #: AutoPaymentEditor.php:685 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:182 +======= +#: 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 +>>>>>>> master #, fuzzy msgid "Last Name" msgstr "Фамилия" @@ -246,10 +355,17 @@ msgstr "Фамилия" msgid "Required" msgstr "Не требуется" +<<<<<<< HEAD #: AutoPaymentEditor.php:680 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:181 +======= +#: 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 +>>>>>>> master #, fuzzy msgid "First Name" msgstr "Имя" @@ -259,7 +375,11 @@ msgstr "Имя" msgid "Middle Name" 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 @@ -296,7 +416,11 @@ msgstr "Рождения / Юбилей Дата" msgid "Age / Years Married" 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 #, fuzzy msgid "Family Role" @@ -442,9 +566,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 @@ -454,8 +584,13 @@ msgid "Home Phone" 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 @@ -463,8 +598,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" @@ -476,13 +616,22 @@ msgstr "Работа / Другая Email" #: 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 "Дата рождения" #: 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 "Дата свадьбы" @@ -514,7 +663,11 @@ msgstr "ПРИМЕЧАНИЕ: Сепараторы (тире и т.д.) или msgid "Default country if none specified otherwise" 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" @@ -709,11 +862,19 @@ 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 #: EventNames.php:266 FamilyCustomFieldsEditor.php:330 #: FamilyCustomFieldsEditor.php:444 FamilyList.php:43 FamilyView.php:535 +======= +#: 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:330 +#: FamilyCustomFieldsEditor.php:444 FamilyList.php:43 FamilyView.php:548 +>>>>>>> master #: GeoPage.php:385 GroupEditor.php:77 GroupPropsFormEditor.php:284 #: GroupPropsFormEditor.php:396 GroupView.php:321 GroupView.php:355 #: PersonCustomFieldsEditor.php:314 PersonCustomFieldsEditor.php:445 @@ -795,19 +956,27 @@ 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 "Вернуться к меню" #: CartView.php:94 +======= +#: CartView.php:58 +msgid "Back to Menu" +msgstr "Вернуться к меню" + +#: CartView.php:93 +>>>>>>> master msgid "Go To Labels" msgstr "Перейти к ярлыкам" @@ -815,6 +984,7 @@ msgstr "Перейти к ярлыкам" msgid "Empty Cart" msgstr "Очистить корзину" +<<<<<<< HEAD #: CartView.php:113 Include/Header.php:131 msgid "Empty Cart to Group" msgstr "Очистить корзину Группе" @@ -824,6 +994,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 "Очистить корзину Событие" @@ -831,7 +1012,11 @@ msgstr "Очистить корзину Событие" msgid "Map Cart" msgstr "Карта Корзина" +<<<<<<< HEAD #: CartView.php:129 +======= +#: CartView.php:135 +>>>>>>> master msgid "Name Tags" msgstr "Теги имен" @@ -839,11 +1024,16 @@ msgstr "Теги имен" msgid "Email Cart" msgstr "Email Корзина" +<<<<<<< HEAD #: CartView.php:164 GroupView.php:205 +======= +#: CartView.php:170 GroupView.php:205 +>>>>>>> master #: sundayschool/SundaySchoolClassView.php:100 msgid "Email (BCC)" msgstr "E-mail (BCC)" +<<<<<<< HEAD #: CartView.php:193 msgid "Create Directory From Cart" msgstr "Создать каталог из корзины" @@ -870,17 +1060,53 @@ 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: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 "Массовые рассылки Presort" + +#: CartView.php:241 +msgid "Quiet Presort" +msgstr "Тихий Presort" + +#: CartView.php:287 +msgid "Your cart contains" +msgstr "Ваша корзина содержит" + +#: CartView.php:287 +msgid "persons from" +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: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" @@ -899,7 +1125,11 @@ msgstr "Выберите событие, к которому вы хотели msgid "Select Event" msgstr "Выберите событие" +<<<<<<< HEAD #: external/templates/verify/verify-family-info.php:140 +======= +#: external/templates/verify/verify-family-info.php:150 +>>>>>>> master msgid "Verify" msgstr "Проверить" @@ -940,11 +1170,19 @@ msgstr "Действие" msgid "No Attendees Assigned to Event" msgstr "Нет Участники назначенного событию" +<<<<<<< HEAD #: Checkin.php:482 ChurchCRM/Service/PersonService.php:38 msgid " of the" 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:476 ChurchCRM/Service/PersonService.php:40 PersonView.php:267 +>>>>>>> master msgid "(No assigned family)" msgstr "(Нет присвоена серия)" @@ -1021,21 +1259,35 @@ msgstr "Какую роль это ребенок?" msgid "Information to Include" msgstr "Информация, включает в себя" +<<<<<<< HEAD #: AutoPaymentEditor.php:690 AutoPaymentEditor.php:695 CartToFamily.php:239 #: CartToFamily.php:244 CartView.php:287 CSVExport.php:105 CSVExport.php:110 +======= +#: 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 "Адрес" #: 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" @@ -1045,7 +1297,11 @@ msgstr "Дата рождения" msgid "Family Home Phone" msgstr "Дом Телефон" +<<<<<<< HEAD #: ChurchCRM/tasks/FamilyWorkPhoneTask.php:30 DirectoryReports.php:181 +======= +#: DirectoryReports.php:181 +>>>>>>> master msgid "Family Work Phone" msgstr "Семья Рабочий телефон" @@ -1054,7 +1310,11 @@ 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 "Семья Email" @@ -1237,11 +1497,19 @@ msgstr "Recurrance Pattern" msgid "Attendance Counts" 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 @@ -1250,7 +1518,11 @@ msgid "Family" msgstr "Семья" #: ElectronicPaymentList.php:199 FamilyCustomFieldsEditor.php:329 +<<<<<<< HEAD #: FamilyCustomFieldsEditor.php:431 FamilyView.php:534 FamilyView.php:639 +======= +#: FamilyCustomFieldsEditor.php:431 FamilyView.php:547 FamilyView.php:655 +>>>>>>> master #: 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 @@ -1258,19 +1530,32 @@ msgstr "Семья" msgid "Type" 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 #: 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 "Количество" +<<<<<<< HEAD #: AutoPaymentEditor.php:654 ElectronicPaymentList.php:204 FamilyView.php:643 #: FamilyView.php:746 FinancialReports.php:305 SelectDelete.php:215 +======= +#: AutoPaymentEditor.php:868 ElectronicPaymentList.php:204 FamilyView.php:659 +#: FamilyView.php:763 FinancialReports.php:305 SelectDelete.php:215 +>>>>>>> master msgid "Fund" msgstr "Фонд" @@ -1289,8 +1574,13 @@ msgid "Year" 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 @@ -1556,7 +1846,11 @@ msgid "Custom Fields" 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 "Члены семьи" @@ -1577,7 +1871,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" @@ -1660,15 +1958,24 @@ msgstr "Unk" msgid "Family View" msgstr "Семья Посмотреть" +<<<<<<< HEAD #: FamilyView.php:232 msgid "Latitude/Longitude" msgstr "Широта / Долгота" #: FamilyEditor.php:881 FamilyView.php:249 ManageEnvelopes.php:170 +======= +#: FamilyView.php:236 +msgid "Latitude/Longitude" +msgstr "Широта / Долгота" + +#: FamilyEditor.php:881 FamilyView.php:254 ManageEnvelopes.php:170 +>>>>>>> master #: PledgeEditor.php:528 msgid "Envelope Number" msgstr "Конверт Количество" +<<<<<<< HEAD #: FamilyView.php:308 msgid "Previous Family" msgstr "Предыдущая Семья" @@ -1694,24 +2001,64 @@ msgid "No property assignments." msgstr "Нет свойства заданий." #: FamilyView.php:536 GroupView.php:356 PersonView.php:655 PrintView.php:451 +======= +#: FamilyView.php:315 +msgid "Previous Family" +msgstr "Предыдущая Семья" + +#: FamilyView.php:323 +msgid "Next Family" +msgstr "Следующая Семья" + +#: FamilyView.php:199 PersonView.php:197 +msgid "Upload Photo" +msgstr "Идет загрузка фото" + +#: FamilyView.php:204 PersonView.php:201 +msgid "Delete Photo" +msgstr "Удалить фотографию" + +#: FamilyView.php:455 +msgid "Pledges and Payments" +msgstr "Объявленные и платежи" + +#: FamilyView.php:540 PersonView.php:647 PrintView.php:446 +msgid "No property assignments." +msgstr "Нет свойства заданий." + +#: 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 "Редактировать Значение" #: FamilyView.php:600 PersonView.php:688 +======= +#: FamilyView.php:552 FamilyView.php:590 GroupView.php:359 GroupView.php:395 +msgid "Edit Value" +msgstr "Редактировать Значение" + +#: FamilyView.php:613 PersonView.php:688 +>>>>>>> master #, fuzzy msgid "Assign a New Property" msgstr "Связать новое свойство" +<<<<<<< HEAD #: FamilyView.php:618 GroupView.php:433 PersonView.php:724 PersonView.php:810 +======= +#: 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 "Следующая дата выплаты" @@ -1750,11 +2097,52 @@ msgstr "Залог или оплаты" #: AutoPaymentEditor.php:632 CanvassEditor.php:198 DepositSlipEditor.php:82 #: EditEventAttendees.php:33 FamilyView.php:748 FindFundRaiser.php:241 +======= +#: 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:754 MemberRoleChange.php:120 PropertyAssign.php:191 +msgid "Update" +msgstr "Обновить" + +#: FamilyView.php:762 +msgid "Pledge or Payment" +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 #: FamilyView.php:750 msgid "NonDeductible" msgstr "NonDeductible" @@ -1784,6 +2172,37 @@ msgid " Canvass Entry" msgstr " Canvass запись" #: DepositSlipEditor.php:223 FamilyView.php:880 FindDepositSlip.php:98 +======= +#: FamilyView.php:767 +msgid "NonDeductible" +msgstr "NonDeductible" + +#: 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 " Canvass запись" + +#: DepositSlipEditor.php:223 FamilyView.php:897 FindDepositSlip.php:98 +>>>>>>> master #: PersonView.php:897 PledgeDelete.php:23 msgid "Confirm Delete" msgstr "Подтвердить удаление" @@ -2358,7 +2777,11 @@ msgstr "Групповые специфические свойства" msgid "Disabled for this group." msgstr "Отключено для этой группы." +<<<<<<< HEAD #: FamilyView.php:438 GroupView.php:342 PersonView.php:382 PrintView.php:435 +======= +#: FamilyView.php:449 GroupView.php:342 PersonView.php:382 PrintView.php:435 +>>>>>>> master #, fuzzy msgid "Assigned Properties" msgstr "Заданными свойствами" @@ -2420,6 +2843,7 @@ msgstr "Неверный Логин или пароль" msgid "Too many failed logins: your account has been locked. Please contact an administrator." msgstr "Слишком много неудачных попыток: ваша учетная запись была заблокирована. Пожалуйста, свяжитесь с администратором." +<<<<<<< HEAD #: Login.php:162 msgid "Please Login" msgstr "Пожалуйста, войдите" @@ -2429,6 +2853,17 @@ msgid "Password" msgstr "Пароль" #: Login.php:150 Login.php:207 +======= +#: Login.php:159 +msgid "Please Login" +msgstr "Пожалуйста, войдите" + +#: BackupDatabase.php:76 Login.php:184 UserList.php:56 +msgid "Password" +msgstr "Пароль" + +#: Login.php:147 Login.php:198 +>>>>>>> master msgid "Login" msgstr "Вход" @@ -2440,8 +2875,13 @@ msgstr "Конверт менеджер" msgid "Update Family Records" msgstr "Обновление Family Records" +<<<<<<< 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 "Подтвердить" @@ -2510,7 +2950,11 @@ msgid "US Address Verification Report" 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" @@ -2847,7 +3291,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 "Возраст" @@ -2868,7 +3316,7 @@ msgstr "Примечание:" msgid "Entered:" msgstr "Вступил:" -#: ChurchCRM/Service/TimelineService.php:124 PrintView.php:484 +#: ChurchCRM/Service/TimelineService.php:126 PrintView.php:484 msgid "by" msgstr "по" @@ -2978,8 +3426,13 @@ msgid "Add a New Property Type" 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 "Класс" @@ -3173,7 +3626,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 "Назначение группы Helper" @@ -3285,11 +3742,19 @@ msgstr "Календарный год" msgid "US Address Verification" msgstr "US Address Verification" +<<<<<<< HEAD #: UserList.php:118 msgid "User Delete Confirmation" msgstr "Пользователь подтверждения удаления" #: UserList.php:120 +======= +#: UserList.php:121 +msgid "User Delete Confirmation" +msgstr "Пользователь подтверждения удаления" + +#: UserList.php:123 +>>>>>>> master msgid "Please confirm removal of user status from:" msgstr "Пожалуйста, подтвердите удаление статуса пользователя от:" @@ -3462,7 +3927,11 @@ msgstr "Новый пароль" msgid "Confirm New Password" msgstr "Подтвердите новый пароль" +<<<<<<< HEAD #: UserList.php:163 +======= +#: UserList.php:166 +>>>>>>> master #, fuzzy msgid "Please confirm the password reset of this user" msgstr "Пожалуйста, подтвердите сброс пароля этого пользователя" @@ -3783,8 +4252,13 @@ msgstr "Связь" msgid "City, State, Zip" msgstr "Город, Район, Страна" +<<<<<<< HEAD #: 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:40 FamilyEditor.php:787 +#: FamilyView.php:241 Reports/ConfirmReportEmail.php:144 +>>>>>>> master #: Reports/ConfirmReport.php:145 msgid "Send Newsletter" msgstr "Отправить бюллетень" diff --git a/src/locale/sq_AL/LC_MESSAGES/messages.po b/src/locale/sq_AL/LC_MESSAGES/messages.po index 43a74ea511..9e201e9208 100644 --- a/src/locale/sq_AL/LC_MESSAGES/messages.po +++ b/src/locale/sq_AL/LC_MESSAGES/messages.po @@ -21,8 +21,13 @@ msgstr "Konfirmo Fshij pagesën automatik" #: DonationFundEditor.php:186 EditEventAttendees.php:76 #: ElectronicPaymentList.php:222 ElectronicPaymentList.php:288 #: EventNames.php:305 FamilyCustomFieldsEditor.php:334 +<<<<<<< HEAD #: FamilyCustomFieldsEditor.php:392 FamilyView.php:645 FamilyView.php:697 #: FamilyView.php:755 FamilyView.php:892 FindDepositSlip.php:108 +======= +#: FamilyCustomFieldsEditor.php:392 FamilyView.php:661 FamilyView.php:713 +#: FamilyView.php:772 FamilyView.php:909 FindDepositSlip.php:108 +>>>>>>> master #: FundRaiserEditor.php:204 ListEvents.php:250 PaddleNumList.php:60 #: PersonCustomFieldsEditor.php:318 PersonCustomFieldsEditor.php:387 #: PersonView.php:908 PledgeDelete.php:57 PropertyList.php:69 @@ -31,11 +36,19 @@ msgstr "Konfirmo Fshij pagesën automatik" msgid "Delete" msgstr "Fshiji" +<<<<<<< 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 @@ -43,17 +56,29 @@ msgstr "Fshiji" #: 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 "Anulo" +<<<<<<< HEAD #: AutoPaymentEditor.php:131 msgid "Automatic payment configuration for the " msgstr "Konfigurimi Automatik pagesa për " #: AutoPaymentEditor.php:582 CanvassEditor.php:242 DepositSlipEditor.php:98 +======= +#: AutoPaymentEditor.php:133 +msgid "Automatic payment configuration for the " +msgstr "Konfigurimi Automatik pagesa për " + +#: 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 @@ -66,7 +91,11 @@ msgstr "Konfigurimi Automatik pagesa për " msgid "Save" msgstr "Ruaj" +<<<<<<< HEAD #: AutoPaymentEditor.php:599 BatchWinnerEntry.php:87 BatchWinnerEntry.php:99 +======= +#: AutoPaymentEditor.php:808 BatchWinnerEntry.php:87 BatchWinnerEntry.php:99 +>>>>>>> master #: 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 @@ -78,6 +107,7 @@ msgstr "Ruaj" msgid "Unassigned" msgstr "Pacaktuara" +<<<<<<< HEAD #: AutoPaymentEditor.php:619 msgid "Automatic payment type" msgstr "Lloji i pagesave automatike" @@ -91,36 +121,71 @@ msgid "Payment interval (months)" msgstr "Intervali i pagesës (muaj)" #: AutoPaymentEditor.php:657 CartToGroup.php:80 EditEventTypes.php:91 +======= +#: AutoPaymentEditor.php:828 +msgid "Automatic payment type" +msgstr "Lloji i pagesave automatike" + +#: AutoPaymentEditor.php:858 +msgid "Payment amount" +msgstr "Shuma e pagesës" + +#: AutoPaymentEditor.php:863 +msgid "Payment interval (months)" +msgstr "Intervali i pagesës (muaj)" + +#: 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 "Asnjë" +<<<<<<< HEAD #: AutoPaymentEditor.php:670 msgid "inactive" msgstr "joaktiv" #: AutoPaymentEditor.php:700 CartToFamily.php:249 CSVExport.php:115 +======= +#: AutoPaymentEditor.php:884 +msgid "inactive" +msgstr "joaktiv" + +#: 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 "Qytet" +<<<<<<< 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 "Shtet" +<<<<<<< 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 "Shteti" +<<<<<<< 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 @@ -128,30 +193,48 @@ msgstr "Shteti" msgid "Phone" msgstr "Telefon" +<<<<<<< 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 "Email" +<<<<<<< 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 "Credit Card" +<<<<<<< HEAD #: AutoPaymentEditor.php:745 msgid "Expiration Month" msgstr "Muaji Skadimit" @@ -169,6 +252,25 @@ msgid "Bank Route Number" msgstr "Banka Route Numri" #: AutoPaymentEditor.php:765 +======= +#: AutoPaymentEditor.php:969 +msgid "Expiration Month" +msgstr "Muaji Skadimit" + +#: AutoPaymentEditor.php:975 +msgid "Expiration Year" +msgstr "Viti Skadimit" + +#: AutoPaymentEditor.php:981 +msgid "Bank Name" +msgstr "Emri i Bankës" + +#: AutoPaymentEditor.php:987 +msgid "Bank Route Number" +msgstr "Banka Route Numri" + +#: AutoPaymentEditor.php:993 +>>>>>>> master msgid "Bank Account Number" msgstr "Numri i llogarisë bankare" @@ -228,10 +330,17 @@ msgstr "Shkruani Fituesit" msgid "CSV Export" msgstr "CSV Export" +<<<<<<< HEAD #: AutoPaymentEditor.php:685 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:182 +======= +#: 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 +>>>>>>> master msgid "Last Name" msgstr "Mbiemër" @@ -239,10 +348,17 @@ msgstr "Mbiemër" msgid "Required" msgstr "I nevojshëm" +<<<<<<< HEAD #: AutoPaymentEditor.php:680 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:181 +======= +#: 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 +>>>>>>> master msgid "First Name" msgstr "Emër" @@ -250,7 +366,11 @@ msgstr "Emër" msgid "Middle Name" msgstr "Emri i dytë" +<<<<<<< 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 @@ -273,7 +393,11 @@ msgstr "Puna / tjera Email" msgid "Membership Date" msgstr "Anëtarësia Data" +<<<<<<< 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 "Roli i familjes" @@ -410,9 +534,15 @@ msgstr "Dhurim Zarf" #: 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 @@ -422,8 +552,13 @@ msgid "Home Phone" msgstr "Faqja Telefon" #: 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 @@ -431,8 +566,13 @@ msgid "Work Phone" msgstr "Puna Phone" #: 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" @@ -444,13 +584,22 @@ msgstr "Puna / tjera Email" #: 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 "Data e lindjes" #: 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 "Dasma Data" @@ -482,7 +631,11 @@ msgstr "SHËNIM: ndarësit (dashes, etj) ose mungesa e tij nuk kanë rëndësi" msgid "Default country if none specified otherwise" msgstr "Vendi Default qoftë se asnjë specifikuara ndryshe" +<<<<<<< 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" @@ -695,11 +848,19 @@ msgstr "Asnjë emër i familjes hyri!" msgid "Add Cart to Family" msgstr "Shto te Shporta Family" +<<<<<<< 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 #: EventNames.php:266 FamilyCustomFieldsEditor.php:330 #: FamilyCustomFieldsEditor.php:444 FamilyList.php:43 FamilyView.php:535 +======= +#: 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:330 +#: FamilyCustomFieldsEditor.php:444 FamilyList.php:43 FamilyView.php:548 +>>>>>>> master #: GeoPage.php:385 GroupEditor.php:77 GroupPropsFormEditor.php:284 #: GroupPropsFormEditor.php:396 GroupView.php:321 GroupView.php:355 #: PersonCustomFieldsEditor.php:314 PersonCustomFieldsEditor.php:445 @@ -778,19 +939,27 @@ msgstr "Shtoni në të Grupit" msgid "Create a New Group" msgstr "Krijo një Grup të Ri" -#: CartView.php:42 +#: CartView.php:41 msgid "View Your Cart" msgstr "Shiko Shporta juaj" -#: CartView.php:50 +#: CartView.php:49 msgid "You have no items in your cart." msgstr "Nuk keni asnjë faqe në karrocë tuaj." +<<<<<<< HEAD #: CartView.php:59 msgid "Back to Menu" msgstr "Kthehu tek Menu" #: CartView.php:94 +======= +#: CartView.php:58 +msgid "Back to Menu" +msgstr "Kthehu tek Menu" + +#: CartView.php:93 +>>>>>>> master msgid "Go To Labels" msgstr "Shko ne Etiketa" @@ -798,6 +967,7 @@ msgstr "Shko ne Etiketa" msgid "Empty Cart" msgstr "Shporta Empty" +<<<<<<< HEAD #: CartView.php:113 Include/Header.php:131 msgid "Empty Cart to Group" msgstr "Shporta bosh të Grupit" @@ -807,6 +977,17 @@ msgid "Empty Cart to Family" msgstr "Shporta bosh për Familjen" #: CartView.php:121 Include/Header.php:141 +======= +#: CartView.php:114 Include/Header.php:131 +msgid "Empty Cart to Group" +msgstr "Shporta bosh të Grupit" + +#: CartView.php:120 Include/Header.php:136 +msgid "Empty Cart to Family" +msgstr "Shporta bosh për Familjen" + +#: CartView.php:124 Include/Header.php:141 +>>>>>>> master msgid "Empty Cart to Event" msgstr "Shporta bosh për Event" @@ -814,7 +995,11 @@ msgstr "Shporta bosh për Event" msgid "Map Cart" msgstr "Harta Shporta" +<<<<<<< HEAD #: CartView.php:129 +======= +#: CartView.php:135 +>>>>>>> master msgid "Name Tags" msgstr "Emri Etiketa" @@ -822,11 +1007,16 @@ msgstr "Emri Etiketa" msgid "Email Cart" msgstr "Email Shporta" +<<<<<<< HEAD #: CartView.php:164 GroupView.php:205 +======= +#: CartView.php:170 GroupView.php:205 +>>>>>>> master #: sundayschool/SundaySchoolClassView.php:100 msgid "Email (BCC)" msgstr "Email (BCC)" +<<<<<<< HEAD #: CartView.php:193 msgid "Create Directory From Cart" msgstr "Krijo Directory Nga Shportë" @@ -853,17 +1043,53 @@ msgstr "persona nga" #: 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:200 +msgid "Create Directory From Cart" +msgstr "Krijo Directory Nga Shportë" + +#: CartView.php:224 CartView.php:266 +msgid "Generate Labels" +msgstr "Generate Etiketa" + +#: CartView.php:232 +msgid "Bulk Mail Presort" +msgstr "Presort Bulk Mail" + +#: CartView.php:241 +msgid "Quiet Presort" +msgstr "Presort qetë" + +#: CartView.php:287 +msgid "Your cart contains" +msgstr "Shporta juaj përmban" + +#: CartView.php:287 +msgid "persons from" +msgstr "persona nga" + +#: 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 "Hiq" +<<<<<<< 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 "Po" +<<<<<<< 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" @@ -881,7 +1107,11 @@ msgstr "Zgjidhni ngjarje për të cilën ju do të donte për të kontrolluar nj msgid "Select Event" msgstr "Zgjidhni Event" +<<<<<<< HEAD #: external/templates/verify/verify-family-info.php:140 +======= +#: external/templates/verify/verify-family-info.php:150 +>>>>>>> master msgid "Verify" msgstr "Verifikoj" @@ -922,16 +1152,28 @@ msgstr "Veprim" msgid "No Attendees Assigned to Event" msgstr "Nuk Pjesëmarrësit caktuar për Event" +<<<<<<< HEAD #: Checkin.php:480 Include/Functions.php:1658 Reports/CanvassReports.php:245 +======= +#: Checkin.php:472 Include/Functions.php:1658 Reports/CanvassReports.php:245 +>>>>>>> master #: Reports/VotingMembers.php:88 queryparameteroptions_qpo.php:15 msgid "Member" msgstr "Anëtar" +<<<<<<< HEAD #: Checkin.php:482 ChurchCRM/Service/PersonService.php:38 msgid " of the" msgstr " i" #: Checkin.php:484 ChurchCRM/Service/PersonService.php:40 PersonView.php:267 +======= +#: Checkin.php:474 ChurchCRM/Service/PersonService.php:38 +msgid " of the" +msgstr " i" + +#: Checkin.php:476 ChurchCRM/Service/PersonService.php:40 PersonView.php:267 +>>>>>>> master msgid "(No assigned family)" msgstr "(Nuk ka familja caktuar)" @@ -1007,21 +1249,35 @@ msgstr "Cili është roli është një fëmijë?" msgid "Information to Include" msgstr "Informacione të përfshijnë" +<<<<<<< HEAD #: AutoPaymentEditor.php:690 AutoPaymentEditor.php:695 CartToFamily.php:239 #: CartToFamily.php:244 CartView.php:287 CSVExport.php:105 CSVExport.php:110 +======= +#: 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 "Adresa" #: 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" @@ -1031,7 +1287,11 @@ msgstr "Ditëlindje" msgid "Family Home Phone" msgstr "Family Phone Faqja kryesore" +<<<<<<< HEAD #: ChurchCRM/tasks/FamilyWorkPhoneTask.php:30 DirectoryReports.php:181 +======= +#: DirectoryReports.php:181 +>>>>>>> master msgid "Family Work Phone" msgstr "Puna Family Phone" @@ -1040,7 +1300,11 @@ msgid "Family Cell Phone" msgstr "Cell Phone Family" #: 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 "Familja Email" @@ -1207,11 +1471,19 @@ msgstr "Recurrance Pattern" msgid "Attendance Counts" msgstr "Pikat Pjesëmarrja" +<<<<<<< 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 @@ -1220,7 +1492,11 @@ msgid "Family" msgstr "Familje" #: ElectronicPaymentList.php:199 FamilyCustomFieldsEditor.php:329 +<<<<<<< HEAD #: FamilyCustomFieldsEditor.php:431 FamilyView.php:534 FamilyView.php:639 +======= +#: FamilyCustomFieldsEditor.php:431 FamilyView.php:547 FamilyView.php:655 +>>>>>>> master #: 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 @@ -1228,19 +1504,32 @@ msgstr "Familje" msgid "Type" msgstr "Lloj" +<<<<<<< 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 "Viti fiskal" +<<<<<<< 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 "Shumë" +<<<<<<< HEAD #: AutoPaymentEditor.php:654 ElectronicPaymentList.php:204 FamilyView.php:643 #: FamilyView.php:746 FinancialReports.php:305 SelectDelete.php:215 +======= +#: AutoPaymentEditor.php:868 ElectronicPaymentList.php:204 FamilyView.php:659 +#: FamilyView.php:763 FinancialReports.php:305 SelectDelete.php:215 +>>>>>>> master msgid "Fund" msgstr "Fond" @@ -1259,8 +1548,13 @@ msgid "Year" msgstr "Viti:" #: 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 @@ -1519,7 +1813,11 @@ msgid "Custom Fields" msgstr "Fushat Custom" #: 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 "Anëtarët e familjes" @@ -1540,7 +1838,11 @@ msgstr "Mes" msgid "Last" msgstr "I fundit" +<<<<<<< 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" @@ -1623,15 +1925,24 @@ msgstr "Unk" msgid "Family View" msgstr "Shiko Family" +<<<<<<< HEAD #: FamilyView.php:232 msgid "Latitude/Longitude" msgstr "Latitude / Longitude" #: FamilyEditor.php:881 FamilyView.php:249 ManageEnvelopes.php:170 +======= +#: FamilyView.php:236 +msgid "Latitude/Longitude" +msgstr "Latitude / Longitude" + +#: FamilyEditor.php:881 FamilyView.php:254 ManageEnvelopes.php:170 +>>>>>>> master #: PledgeEditor.php:528 msgid "Envelope Number" msgstr "Zarf Numri" +<<<<<<< HEAD #: FamilyView.php:308 msgid "Previous Family" msgstr "Familja Kthehu" @@ -1661,10 +1972,42 @@ msgid "No property assignments." msgstr "Nuk ka detyra të pronës." #: FamilyView.php:536 GroupView.php:356 PersonView.php:655 PrintView.php:451 +======= +#: FamilyView.php:315 +msgid "Previous Family" +msgstr "Familja Kthehu" + +#: FamilyView.php:323 +msgid "Next Family" +msgstr "Familja Next" + +#: FamilyView.php:199 PersonView.php:197 +msgid "Upload Photo" +msgstr "Ngarko Foto" + +#: FamilyView.php:204 PersonView.php:201 +msgid "Delete Photo" +msgstr "Fshij Foto" + +#: FamilyView.php:453 +msgid "Automatic Payments" +msgstr "Pagesat automatike" + +#: FamilyView.php:455 +msgid "Pledges and Payments" +msgstr "Premton dhe Pagesat" + +#: FamilyView.php:540 PersonView.php:647 PrintView.php:446 +msgid "No property assignments." +msgstr "Nuk ka detyra të pronës." + +#: FamilyView.php:549 GroupView.php:356 PersonView.php:655 PrintView.php:451 +>>>>>>> master #: PropertyAssign.php:180 SystemSettings.php:152 msgid "Value" msgstr "Vlera" +<<<<<<< HEAD #: FamilyView.php:539 FamilyView.php:577 GroupView.php:359 GroupView.php:395 msgid "Edit Value" msgstr "Edit Vlera" @@ -1674,10 +2017,22 @@ msgid "Assign a New Property" msgstr "Cakto një Pronës Re" #: 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 "Edit Vlera" + +#: FamilyView.php:613 PersonView.php:688 +msgid "Assign a New Property" +msgstr "Cakto një Pronës Re" + +#: FamilyView.php:634 GroupView.php:433 PersonView.php:724 PersonView.php:810 +>>>>>>> master #: PropertyAssign.php:189 SelectList.php:1081 msgid "Assign" msgstr "Caktoj" +<<<<<<< HEAD #: FamilyView.php:640 msgid "Next payment date" msgstr "Data e pagesës Next" @@ -1716,11 +2071,52 @@ msgstr "Pengut apo Pagesa" #: AutoPaymentEditor.php:632 CanvassEditor.php:198 DepositSlipEditor.php:82 #: EditEventAttendees.php:33 FamilyView.php:748 FindFundRaiser.php:241 +======= +#: FamilyView.php:656 +msgid "Next payment date" +msgstr "Data e pagesës Next" + +#: FamilyView.php:658 +msgid "Interval (months)" +msgstr "Interval (muaj)" + +#: FamilyView.php:662 FamilyView.php:773 SelectDelete.php:222 +msgid "Date Updated" +msgstr "Data përditësua" + +#: FamilyView.php:663 FamilyView.php:774 SelectDelete.php:223 +msgid "Updated By" +msgstr "Përditësuar By" + +#: FamilyView.php:729 +msgid "Add a new automatic payment" +msgstr "Shto një pagesë të re automatike" + +#: FamilyView.php:741 +msgid "Show Pledges" +msgstr "Shfaq premton" + +#: FamilyView.php:745 +msgid "Show Payments" +msgstr "Shfaq Pagesat" + +#: FamilyView.php:754 MemberRoleChange.php:120 PropertyAssign.php:191 +msgid "Update" +msgstr "Përmirso" + +#: FamilyView.php:762 +msgid "Pledge or Payment" +msgstr "Pengut apo Pagesa" + +#: 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 "Data" +<<<<<<< HEAD #: FamilyView.php:750 msgid "NonDeductible" msgstr "Pazbritshme" @@ -1750,6 +2146,37 @@ msgid " Canvass Entry" msgstr " Diskutoj Hyrja" #: DepositSlipEditor.php:223 FamilyView.php:880 FindDepositSlip.php:98 +======= +#: FamilyView.php:767 +msgid "NonDeductible" +msgstr "Pazbritshme" + +#: FamilyView.php:768 SelectDelete.php:219 +msgid "Schedule" +msgstr "Orar" + +#: FamilyView.php:769 SelectDelete.php:220 +msgid "Method" +msgstr "Metodë" + +#: FamilyView.php:770 PledgeEditor.php:725 SelectDelete.php:221 +msgid "Comment" +msgstr "Komento" + +#: FamilyView.php:862 +msgid "Add a new pledge" +msgstr "Shto një premtim të ri" + +#: FamilyView.php:864 +msgid "Add a new payment" +msgstr "Shto një pagesë të re" + +#: FamilyView.php:875 +msgid " Canvass Entry" +msgstr " Diskutoj Hyrja" + +#: DepositSlipEditor.php:223 FamilyView.php:897 FindDepositSlip.php:98 +>>>>>>> master #: PersonView.php:897 PledgeDelete.php:23 msgid "Confirm Delete" msgstr "Konfirmo Fshij" @@ -2290,7 +2717,11 @@ msgstr "Grupi-specifike Prona të paluajtshme" msgid "Disabled for this group." msgstr "Me aftësi të kufizuara për këtë grup." +<<<<<<< HEAD #: FamilyView.php:438 GroupView.php:342 PersonView.php:382 PrintView.php:435 +======= +#: FamilyView.php:449 GroupView.php:342 PersonView.php:382 PrintView.php:435 +>>>>>>> master msgid "Assigned Properties" msgstr "Prona të caktuar" @@ -2351,6 +2782,7 @@ msgstr "Login pavlefshme ose regjistrohu" msgid "Too many failed logins: your account has been locked. Please contact an administrator." msgstr "Shumë hyrje të dështuara: llogaria juaj ka qenë e mbyllur. Ju lutem kontaktoni një administrator." +<<<<<<< HEAD #: Login.php:162 msgid "Please Login" msgstr "Ju lutem Identifikohu" @@ -2360,6 +2792,17 @@ msgid "Password" msgstr "Fjalekalmi" #: Login.php:150 Login.php:207 +======= +#: Login.php:159 +msgid "Please Login" +msgstr "Ju lutem Identifikohu" + +#: BackupDatabase.php:76 Login.php:184 UserList.php:56 +msgid "Password" +msgstr "Fjalekalmi" + +#: Login.php:147 Login.php:198 +>>>>>>> master msgid "Login" msgstr "Hyrje" @@ -2371,8 +2814,13 @@ msgstr "Zarf Menaxher" msgid "Update Family Records" msgstr "Update Records familjare" +<<<<<<< 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 "Konfirmoj" @@ -2443,7 +2891,11 @@ msgid "US Address Verification Report" msgstr "SHBA Adresa Verifikimi Raport" #: 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" @@ -2775,7 +3227,11 @@ msgstr "Shiko printueshëm" #: PrintView.php:325 Reports/CanvassReports.php:244 #: sundayschool/SundaySchoolClassView.php:201 +<<<<<<< HEAD #: sundayschool/SundaySchoolDashboard.php:184 +======= +#: sundayschool/SundaySchoolDashboard.php:196 +>>>>>>> master msgid "Age" msgstr "Moshë" @@ -2795,7 +3251,7 @@ msgstr "Shënime:" msgid "Entered:" msgstr "Regjistruar:" -#: ChurchCRM/Service/TimelineService.php:124 PrintView.php:484 +#: ChurchCRM/Service/TimelineService.php:126 PrintView.php:484 msgid "by" msgstr "nga" @@ -2902,8 +3358,13 @@ msgid "Add a New Property Type" msgstr "Shto një re Tipi i Pronës" #: 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 "Klasë" @@ -3087,7 +3548,11 @@ msgstr "Fshij Record familjare dhe anëtarët e familjes" msgid "Person Listing" msgstr "Person Listing" +<<<<<<< HEAD #: SelectList.php:184 menuconfig_mcf.php:12 +======= +#: SelectList.php:184 menuconfig_mcf.php:13 +>>>>>>> master msgid "Group Assignment Helper" msgstr "Grupi Caktimi Helper" @@ -3197,11 +3662,19 @@ msgstr "Viti Kalendari" msgid "US Address Verification" msgstr "Adresa SHBA Verifikimi" +<<<<<<< HEAD #: UserList.php:118 msgid "User Delete Confirmation" msgstr "User Fshije Konfirmimi" #: UserList.php:120 +======= +#: UserList.php:121 +msgid "User Delete Confirmation" +msgstr "User Fshije Konfirmimi" + +#: UserList.php:123 +>>>>>>> master msgid "Please confirm removal of user status from:" msgstr "Ju lutem konfirmoni heqjen e statusit të përdoruesit nga:" @@ -3355,7 +3828,11 @@ msgstr "Fjalëkalimi i ri" msgid "Confirm New Password" msgstr "Konfirmo Re Password" +<<<<<<< HEAD #: UserList.php:163 +======= +#: UserList.php:166 +>>>>>>> master msgid "Please confirm the password reset of this user" msgstr "Ju lutem konfirmoni ricaktim fjalëkalimi për këtë përdorues" @@ -3668,8 +4145,13 @@ msgstr "Ndërlidhje" msgid "City, State, Zip" msgstr "Qyteti, Shteti, Zip" +<<<<<<< HEAD #: 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:40 FamilyEditor.php:787 +#: FamilyView.php:241 Reports/ConfirmReportEmail.php:144 +>>>>>>> master #: Reports/ConfirmReport.php:145 msgid "Send Newsletter" msgstr "Dërgo lajme me email" @@ -3888,7 +4370,11 @@ msgstr "Shiko të gjitha Familjet" msgid "Events" msgstr "Ngjarje" +<<<<<<< HEAD #: FundRaiserEditor.php:35 menuconfig_mcf.php:25 +======= +#: FundRaiserEditor.php:35 menuconfig_mcf.php:26 +>>>>>>> master msgid "Fundraiser" msgstr "Fondesh" @@ -3896,7 +4382,11 @@ msgstr "Fondesh" msgid "Deposit Type" msgstr "Lloji Depozita" +<<<<<<< HEAD #: ChurchCRM/dto/SystemConfig.php:219 +======= +#: ChurchCRM/dto/SystemConfig.php:220 +>>>>>>> master msgid "Report Settings" msgstr "Raporti Cilësimet" diff --git a/src/locale/sv_SE/LC_MESSAGES/messages.po b/src/locale/sv_SE/LC_MESSAGES/messages.po index 891e534c02..dab3ba7a44 100644 --- a/src/locale/sv_SE/LC_MESSAGES/messages.po +++ b/src/locale/sv_SE/LC_MESSAGES/messages.po @@ -21,8 +21,13 @@ msgstr "Godkänna att radera autobetalningen" #: DonationFundEditor.php:186 EditEventAttendees.php:76 #: ElectronicPaymentList.php:222 ElectronicPaymentList.php:288 #: EventNames.php:305 FamilyCustomFieldsEditor.php:334 +<<<<<<< HEAD #: FamilyCustomFieldsEditor.php:392 FamilyView.php:645 FamilyView.php:697 #: FamilyView.php:755 FamilyView.php:892 FindDepositSlip.php:108 +======= +#: FamilyCustomFieldsEditor.php:392 FamilyView.php:661 FamilyView.php:713 +#: FamilyView.php:772 FamilyView.php:909 FindDepositSlip.php:108 +>>>>>>> master #: FundRaiserEditor.php:204 ListEvents.php:250 PaddleNumList.php:60 #: PersonCustomFieldsEditor.php:318 PersonCustomFieldsEditor.php:387 #: PersonView.php:908 PledgeDelete.php:57 PropertyList.php:69 @@ -31,11 +36,19 @@ msgstr "Godkänna att radera autobetalningen" msgid "Delete" msgstr "Radera" +<<<<<<< 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 @@ -43,17 +56,29 @@ msgstr "Radera" #: 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 "Avbryt" +<<<<<<< HEAD #: AutoPaymentEditor.php:131 msgid "Automatic payment configuration for the " msgstr "Autobetalning konfiguration till " #: AutoPaymentEditor.php:582 CanvassEditor.php:242 DepositSlipEditor.php:98 +======= +#: AutoPaymentEditor.php:133 +msgid "Automatic payment configuration for the " +msgstr "Autobetalning konfiguration till " + +#: 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 @@ -66,7 +91,11 @@ msgstr "Autobetalning konfiguration till " msgid "Save" msgstr "Spara" +<<<<<<< HEAD #: AutoPaymentEditor.php:599 BatchWinnerEntry.php:87 BatchWinnerEntry.php:99 +======= +#: AutoPaymentEditor.php:808 BatchWinnerEntry.php:87 BatchWinnerEntry.php:99 +>>>>>>> master #: 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 @@ -78,6 +107,7 @@ msgstr "Spara" msgid "Unassigned" msgstr "otilldelade" +<<<<<<< HEAD #: AutoPaymentEditor.php:619 msgid "Automatic payment type" msgstr "Autobetalningstyp" @@ -91,36 +121,71 @@ msgid "Payment interval (months)" msgstr "Betalningsinterval(månader)" #: AutoPaymentEditor.php:657 CartToGroup.php:80 EditEventTypes.php:91 +======= +#: AutoPaymentEditor.php:828 +msgid "Automatic payment type" +msgstr "Autobetalningstyp" + +#: AutoPaymentEditor.php:858 +msgid "Payment amount" +msgstr "Betalningssumma" + +#: AutoPaymentEditor.php:863 +msgid "Payment interval (months)" +msgstr "Betalningsinterval(månader)" + +#: 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 "Inga" +<<<<<<< HEAD #: AutoPaymentEditor.php:670 msgid "inactive" msgstr "overksam" #: AutoPaymentEditor.php:700 CartToFamily.php:249 CSVExport.php:115 +======= +#: AutoPaymentEditor.php:884 +msgid "inactive" +msgstr "overksam" + +#: 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 "Stad" +<<<<<<< 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 "Län" +<<<<<<< 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 "Land" +<<<<<<< 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 @@ -128,30 +193,48 @@ msgstr "Land" msgid "Phone" msgstr "Telefon" +<<<<<<< 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 "Epost" +<<<<<<< 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 "Kreditkort" +<<<<<<< HEAD #: AutoPaymentEditor.php:745 msgid "Expiration Month" msgstr "Giltighetsslutmånad" @@ -169,6 +252,25 @@ msgid "Bank Route Number" msgstr "Bankruttnummer" #: AutoPaymentEditor.php:765 +======= +#: AutoPaymentEditor.php:969 +msgid "Expiration Month" +msgstr "Giltighetsslutmånad" + +#: AutoPaymentEditor.php:975 +msgid "Expiration Year" +msgstr "Giltighetsslutår" + +#: AutoPaymentEditor.php:981 +msgid "Bank Name" +msgstr "Banknamn" + +#: AutoPaymentEditor.php:987 +msgid "Bank Route Number" +msgstr "Bankruttnummer" + +#: AutoPaymentEditor.php:993 +>>>>>>> master msgid "Bank Account Number" msgstr "Bankkontonummer" @@ -236,10 +338,17 @@ msgstr "Ange Vinnare" msgid "CSV Export" msgstr "CSV Export" +<<<<<<< HEAD #: AutoPaymentEditor.php:685 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:182 +======= +#: 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 +>>>>>>> master #, fuzzy msgid "Last Name" msgstr "Efternamn" @@ -248,10 +357,17 @@ msgstr "Efternamn" msgid "Required" msgstr "Obligatorisk " +<<<<<<< HEAD #: AutoPaymentEditor.php:680 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:181 +======= +#: 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 +>>>>>>> master #, fuzzy msgid "First Name" msgstr "Tilltalsnamn" @@ -261,7 +377,11 @@ msgstr "Tilltalsnamn" msgid "Middle Name" msgstr "Andra förnamn" +<<<<<<< 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 @@ -298,7 +418,11 @@ msgstr "födelse / Bröllopsdatumet" msgid "Age / Years Married" msgstr "Ålder / År gifte" +<<<<<<< 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 #, fuzzy msgid "Family Role" @@ -444,9 +568,15 @@ msgstr "Insamlingskuvert" #: 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 @@ -456,8 +586,13 @@ msgid "Home Phone" msgstr "Hemtelefon" #: 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 @@ -465,8 +600,13 @@ msgid "Work Phone" msgstr "Arbetstelefon" #: 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" @@ -478,13 +618,22 @@ msgstr "Arbets- / Övriga epost" #: 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 "Födelsedatum" #: 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 "Bröllopsdatum" @@ -516,7 +665,11 @@ msgstr "OBS: Avskiljare (strek, osv.) eller saknaden därav är betydelselös" msgid "Default country if none specified otherwise" msgstr "Förinställd land om ingen annan angiven" +<<<<<<< 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" @@ -711,11 +864,19 @@ msgstr "Ingen familjnamn inmatad!" msgid "Add Cart to Family" msgstr "Lägg korgen till familj" +<<<<<<< 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 #: EventNames.php:266 FamilyCustomFieldsEditor.php:330 #: FamilyCustomFieldsEditor.php:444 FamilyList.php:43 FamilyView.php:535 +======= +#: 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:330 +#: FamilyCustomFieldsEditor.php:444 FamilyList.php:43 FamilyView.php:548 +>>>>>>> master #: GeoPage.php:385 GroupEditor.php:77 GroupPropsFormEditor.php:284 #: GroupPropsFormEditor.php:396 GroupView.php:321 GroupView.php:355 #: PersonCustomFieldsEditor.php:314 PersonCustomFieldsEditor.php:445 @@ -797,19 +958,27 @@ msgstr "Lägg till grupp" msgid "Create a New Group" msgstr "Skapa en ny grupp" -#: CartView.php:42 +#: CartView.php:41 msgid "View Your Cart" msgstr "Visa korgen" -#: CartView.php:50 +#: CartView.php:49 msgid "You have no items in your cart." msgstr "Korgen är tom." +<<<<<<< HEAD #: CartView.php:59 msgid "Back to Menu" msgstr "Tillbaka till menyn" #: CartView.php:94 +======= +#: CartView.php:58 +msgid "Back to Menu" +msgstr "Tillbaka till menyn" + +#: CartView.php:93 +>>>>>>> master msgid "Go To Labels" msgstr "Gå till etikett" @@ -817,6 +986,7 @@ msgstr "Gå till etikett" msgid "Empty Cart" msgstr "Tom korgen" +<<<<<<< HEAD #: CartView.php:113 Include/Header.php:131 msgid "Empty Cart to Group" msgstr "Tom korgen till grupp" @@ -826,6 +996,17 @@ msgid "Empty Cart to Family" msgstr "Tom korgen till familj" #: CartView.php:121 Include/Header.php:141 +======= +#: CartView.php:114 Include/Header.php:131 +msgid "Empty Cart to Group" +msgstr "Tom korgen till grupp" + +#: CartView.php:120 Include/Header.php:136 +msgid "Empty Cart to Family" +msgstr "Tom korgen till familj" + +#: CartView.php:124 Include/Header.php:141 +>>>>>>> master msgid "Empty Cart to Event" msgstr "Tom korgen till evenemang" @@ -833,7 +1014,11 @@ msgstr "Tom korgen till evenemang" msgid "Map Cart" msgstr "Kartlägga korgen" +<<<<<<< HEAD #: CartView.php:129 +======= +#: CartView.php:135 +>>>>>>> master #, fuzzy msgid "Name Tags" msgstr "Namn" @@ -842,11 +1027,16 @@ msgstr "Namn" msgid "Email Cart" msgstr "Epost korg" +<<<<<<< HEAD #: CartView.php:164 GroupView.php:205 +======= +#: CartView.php:170 GroupView.php:205 +>>>>>>> master #: sundayschool/SundaySchoolClassView.php:100 msgid "Email (BCC)" msgstr "Epost (BCC)" +<<<<<<< HEAD #: CartView.php:193 msgid "Create Directory From Cart" msgstr "Skapa katalog från korgen" @@ -873,17 +1063,53 @@ msgstr "personer ifrån" #: 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:200 +msgid "Create Directory From Cart" +msgstr "Skapa katalog från korgen" + +#: CartView.php:224 CartView.php:266 +msgid "Generate Labels" +msgstr "Skapa etikett" + +#: CartView.php:232 +msgid "Bulk Mail Presort" +msgstr "Sortera post enl postkod" + +#: CartView.php:241 +msgid "Quiet Presort" +msgstr "Tyst sortera" + +#: CartView.php:287 +msgid "Your cart contains" +msgstr "Korgen innehåller" + +#: CartView.php:287 +msgid "persons from" +msgstr "personer ifrån" + +#: 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 "Ta bort" +<<<<<<< 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 "Ja" +<<<<<<< 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" @@ -902,7 +1128,11 @@ msgstr "Välj evenemang som du vill checka in personer till" msgid "Select Event" msgstr "Välj evenemang" +<<<<<<< HEAD #: external/templates/verify/verify-family-info.php:140 +======= +#: external/templates/verify/verify-family-info.php:150 +>>>>>>> master msgid "Verify" msgstr "Bekräfta" @@ -943,16 +1173,28 @@ msgstr "Handling" msgid "No Attendees Assigned to Event" msgstr "Inga deltagare angiven till evenemang" +<<<<<<< HEAD #: Checkin.php:480 Include/Functions.php:1658 Reports/CanvassReports.php:245 +======= +#: Checkin.php:472 Include/Functions.php:1658 Reports/CanvassReports.php:245 +>>>>>>> master #: Reports/VotingMembers.php:88 queryparameteroptions_qpo.php:15 msgid "Member" msgstr "Medlem" +<<<<<<< HEAD #: Checkin.php:482 ChurchCRM/Service/PersonService.php:38 msgid " of the" msgstr " av " #: Checkin.php:484 ChurchCRM/Service/PersonService.php:40 PersonView.php:267 +======= +#: Checkin.php:474 ChurchCRM/Service/PersonService.php:38 +msgid " of the" +msgstr " av " + +#: Checkin.php:476 ChurchCRM/Service/PersonService.php:40 PersonView.php:267 +>>>>>>> master msgid "(No assigned family)" msgstr "(Ingen angiven familj)" @@ -1029,21 +1271,35 @@ msgstr "Vilket roll är ett barn?" msgid "Information to Include" msgstr "Informationen att inkludera" +<<<<<<< HEAD #: AutoPaymentEditor.php:690 AutoPaymentEditor.php:695 CartToFamily.php:239 #: CartToFamily.php:244 CartView.php:287 CSVExport.php:105 CSVExport.php:110 +======= +#: 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 "Adress" #: 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" @@ -1053,7 +1309,11 @@ msgstr "Födelsedatum" msgid "Family Home Phone" msgstr "Familjens hem telefon" +<<<<<<< HEAD #: ChurchCRM/tasks/FamilyWorkPhoneTask.php:30 DirectoryReports.php:181 +======= +#: DirectoryReports.php:181 +>>>>>>> master msgid "Family Work Phone" msgstr "Familjens arbetstelefon" @@ -1062,7 +1322,11 @@ msgid "Family Cell Phone" msgstr "Familjens mobiltelefon" #: 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 "Familjens epost" @@ -1250,11 +1514,19 @@ msgstr "Återkommande mönster" msgid "Attendance Counts" msgstr "Deltagande summor" +<<<<<<< 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 @@ -1263,7 +1535,11 @@ msgid "Family" msgstr "Familj" #: ElectronicPaymentList.php:199 FamilyCustomFieldsEditor.php:329 +<<<<<<< HEAD #: FamilyCustomFieldsEditor.php:431 FamilyView.php:534 FamilyView.php:639 +======= +#: FamilyCustomFieldsEditor.php:431 FamilyView.php:547 FamilyView.php:655 +>>>>>>> master #: 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 @@ -1271,19 +1547,32 @@ msgstr "Familj" msgid "Type" msgstr "Typ" +<<<<<<< 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 "Bokföringsår" +<<<<<<< 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 "Summa" +<<<<<<< HEAD #: AutoPaymentEditor.php:654 ElectronicPaymentList.php:204 FamilyView.php:643 #: FamilyView.php:746 FinancialReports.php:305 SelectDelete.php:215 +======= +#: AutoPaymentEditor.php:868 ElectronicPaymentList.php:204 FamilyView.php:659 +#: FamilyView.php:763 FinancialReports.php:305 SelectDelete.php:215 +>>>>>>> master msgid "Fund" msgstr "Fond" @@ -1302,8 +1591,13 @@ msgid "Year" msgstr "År" #: 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 @@ -1575,7 +1869,11 @@ msgid "Custom Fields" msgstr "Fritt anpassade fält" #: 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 "Familj medlemmar" @@ -1596,7 +1894,11 @@ msgstr "Andra förnamn" msgid "Last" msgstr "Efternamn" +<<<<<<< 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" @@ -1679,15 +1981,24 @@ msgstr "Okänd" msgid "Family View" msgstr "Familj vy" +<<<<<<< HEAD #: FamilyView.php:232 msgid "Latitude/Longitude" msgstr "Latitud/Longitud" #: FamilyEditor.php:881 FamilyView.php:249 ManageEnvelopes.php:170 +======= +#: FamilyView.php:236 +msgid "Latitude/Longitude" +msgstr "Latitud/Longitud" + +#: FamilyEditor.php:881 FamilyView.php:254 ManageEnvelopes.php:170 +>>>>>>> master #: PledgeEditor.php:528 msgid "Envelope Number" msgstr "Kuvertnummer" +<<<<<<< HEAD #: FamilyView.php:308 msgid "Previous Family" msgstr "Föregående familj" @@ -1713,24 +2024,64 @@ msgid "No property assignments." msgstr "Inga egenskaper angiven." #: FamilyView.php:536 GroupView.php:356 PersonView.php:655 PrintView.php:451 +======= +#: FamilyView.php:315 +msgid "Previous Family" +msgstr "Föregående familj" + +#: FamilyView.php:323 +msgid "Next Family" +msgstr "Nästa familj" + +#: FamilyView.php:199 PersonView.php:197 +msgid "Upload Photo" +msgstr "Ladda in foto" + +#: FamilyView.php:204 PersonView.php:201 +msgid "Delete Photo" +msgstr "Radera foto" + +#: FamilyView.php:455 +msgid "Pledges and Payments" +msgstr "Bidrag löfte och betalningar" + +#: FamilyView.php:540 PersonView.php:647 PrintView.php:446 +msgid "No property assignments." +msgstr "Inga egenskaper angiven." + +#: FamilyView.php:549 GroupView.php:356 PersonView.php:655 PrintView.php:451 +>>>>>>> master #: PropertyAssign.php:180 SystemSettings.php:152 msgid "Value" msgstr "Värd" +<<<<<<< HEAD #: FamilyView.php:539 FamilyView.php:577 GroupView.php:359 GroupView.php:395 msgid "Edit Value" msgstr "Redigera värd" #: FamilyView.php:600 PersonView.php:688 +======= +#: FamilyView.php:552 FamilyView.php:590 GroupView.php:359 GroupView.php:395 +msgid "Edit Value" +msgstr "Redigera värd" + +#: FamilyView.php:613 PersonView.php:688 +>>>>>>> master #, fuzzy msgid "Assign a New Property" msgstr "Ange en ny egenskap" +<<<<<<< HEAD #: FamilyView.php:618 GroupView.php:433 PersonView.php:724 PersonView.php:810 +======= +#: FamilyView.php:634 GroupView.php:433 PersonView.php:724 PersonView.php:810 +>>>>>>> master #: PropertyAssign.php:189 SelectList.php:1081 msgid "Assign" msgstr "Ange" +<<<<<<< HEAD #: FamilyView.php:640 msgid "Next payment date" msgstr "Nästa betalningsdatum" @@ -1769,11 +2120,52 @@ msgstr "Betalningar eller löften om betalningar" #: AutoPaymentEditor.php:632 CanvassEditor.php:198 DepositSlipEditor.php:82 #: EditEventAttendees.php:33 FamilyView.php:748 FindFundRaiser.php:241 +======= +#: FamilyView.php:656 +msgid "Next payment date" +msgstr "Nästa betalningsdatum" + +#: FamilyView.php:658 +msgid "Interval (months)" +msgstr "Interval (månader)" + +#: FamilyView.php:662 FamilyView.php:773 SelectDelete.php:222 +msgid "Date Updated" +msgstr "Datumet updaterad" + +#: FamilyView.php:663 FamilyView.php:774 SelectDelete.php:223 +msgid "Updated By" +msgstr "Ändrades av" + +#: FamilyView.php:729 +msgid "Add a new automatic payment" +msgstr "Lägg till en ny automatiska betalning" + +#: FamilyView.php:741 +msgid "Show Pledges" +msgstr "Visa löften om betalningar" + +#: FamilyView.php:745 +msgid "Show Payments" +msgstr "Visa betalningar" + +#: FamilyView.php:754 MemberRoleChange.php:120 PropertyAssign.php:191 +msgid "Update" +msgstr "Uppdatera" + +#: FamilyView.php:762 +msgid "Pledge or Payment" +msgstr "Betalningar eller löften om betalningar" + +#: 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 "Datum" +<<<<<<< HEAD #: FamilyView.php:750 msgid "NonDeductible" msgstr "Ej avdragsgiltig" @@ -1803,6 +2195,37 @@ msgid " Canvass Entry" msgstr " Insamlingskampanj inmatning" #: DepositSlipEditor.php:223 FamilyView.php:880 FindDepositSlip.php:98 +======= +#: FamilyView.php:767 +msgid "NonDeductible" +msgstr "Ej avdragsgiltig" + +#: FamilyView.php:768 SelectDelete.php:219 +msgid "Schedule" +msgstr "Schema" + +#: FamilyView.php:769 SelectDelete.php:220 +msgid "Method" +msgstr "Metod" + +#: FamilyView.php:770 PledgeEditor.php:725 SelectDelete.php:221 +msgid "Comment" +msgstr "Kommentar" + +#: FamilyView.php:862 +msgid "Add a new pledge" +msgstr "Lägg till en ny löfte om betalningar" + +#: FamilyView.php:864 +msgid "Add a new payment" +msgstr "Lägg till en ny betalning" + +#: FamilyView.php:875 +msgid " Canvass Entry" +msgstr " Insamlingskampanj inmatning" + +#: DepositSlipEditor.php:223 FamilyView.php:897 FindDepositSlip.php:98 +>>>>>>> master #: PersonView.php:897 PledgeDelete.php:23 msgid "Confirm Delete" msgstr "Bekräfta radera" @@ -2387,7 +2810,11 @@ msgstr "Grupp specifik egenskapar" msgid "Disabled for this group." msgstr "oaktiverad för denna grupp" +<<<<<<< HEAD #: FamilyView.php:438 GroupView.php:342 PersonView.php:382 PrintView.php:435 +======= +#: FamilyView.php:449 GroupView.php:342 PersonView.php:382 PrintView.php:435 +>>>>>>> master #, fuzzy msgid "Assigned Properties" msgstr "Angiven egenskaper" @@ -2449,6 +2876,7 @@ msgstr "Ogiltig användernamn eller lösenord" msgid "Too many failed logins: your account has been locked. Please contact an administrator." msgstr "För många felaktiga inloggningar: ditt konto är låst. Kontaka administratören." +<<<<<<< HEAD #: Login.php:162 msgid "Please Login" msgstr "Var snäll och logga in" @@ -2458,6 +2886,17 @@ msgid "Password" msgstr "Lösenord" #: Login.php:150 Login.php:207 +======= +#: Login.php:159 +msgid "Please Login" +msgstr "Var snäll och logga in" + +#: BackupDatabase.php:76 Login.php:184 UserList.php:56 +msgid "Password" +msgstr "Lösenord" + +#: Login.php:147 Login.php:198 +>>>>>>> master msgid "Login" msgstr "logga in" @@ -2470,8 +2909,13 @@ msgstr "Kuvert skötare" msgid "Update Family Records" msgstr "Lägg till en ny familj post" +<<<<<<< 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 #, fuzzy msgid "Confirm" @@ -2544,7 +2988,11 @@ msgid "US Address Verification Report" msgstr "US adress konfirmation rapport" #: 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" @@ -2902,7 +3350,11 @@ msgstr "Utskriftsbar vy" #: PrintView.php:325 Reports/CanvassReports.php:244 #: sundayschool/SundaySchoolClassView.php:201 +<<<<<<< HEAD #: sundayschool/SundaySchoolDashboard.php:184 +======= +#: sundayschool/SundaySchoolDashboard.php:196 +>>>>>>> master msgid "Age" msgstr "Ålder" @@ -2923,7 +3375,7 @@ msgstr "Anteckningar:" msgid "Entered:" msgstr "Angiven:" -#: ChurchCRM/Service/TimelineService.php:124 PrintView.php:484 +#: ChurchCRM/Service/TimelineService.php:126 PrintView.php:484 msgid "by" msgstr "av" @@ -3033,8 +3485,13 @@ msgid "Add a New Property Type" msgstr "Lägg till en ny egenskapstyp" #: 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 "Klass" @@ -3228,7 +3685,11 @@ msgstr "Radera familj post och familj medlemmar" msgid "Person Listing" msgstr "Person lista" +<<<<<<< HEAD #: SelectList.php:184 menuconfig_mcf.php:12 +======= +#: SelectList.php:184 menuconfig_mcf.php:13 +>>>>>>> master msgid "Group Assignment Helper" msgstr "Grupp tilldelnings-verktyg" @@ -3342,11 +3803,19 @@ msgstr "Kalender år" msgid "US Address Verification" msgstr "Bekräfta USA adress" +<<<<<<< HEAD #: UserList.php:118 msgid "User Delete Confirmation" msgstr "Bekräfta radera användare" #: UserList.php:120 +======= +#: UserList.php:121 +msgid "User Delete Confirmation" +msgstr "Bekräfta radera användare" + +#: UserList.php:123 +>>>>>>> master msgid "Please confirm removal of user status from:" msgstr "Bekräfta att du vill radera användare status från:" @@ -3519,7 +3988,11 @@ msgstr "Det nya lösenordet" msgid "Confirm New Password" msgstr "Bekräfta det nya lösenordet" +<<<<<<< HEAD #: UserList.php:163 +======= +#: UserList.php:166 +>>>>>>> master #, fuzzy msgid "Please confirm the password reset of this user" msgstr "Bekräfta omställningen av lösenordet för denna användare" @@ -3858,8 +4331,13 @@ msgstr "Förknippat med" msgid "City, State, Zip" msgstr "Stad, län, postkod" +<<<<<<< HEAD #: 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:40 FamilyEditor.php:787 +#: FamilyView.php:241 Reports/ConfirmReportEmail.php:144 +>>>>>>> master #: Reports/ConfirmReport.php:145 msgid "Send Newsletter" msgstr "Skicka nyhetsbrev" diff --git a/src/locale/vi_VN/LC_MESSAGES/messages.po b/src/locale/vi_VN/LC_MESSAGES/messages.po index c53bda0d6f..06b998221b 100644 --- a/src/locale/vi_VN/LC_MESSAGES/messages.po +++ b/src/locale/vi_VN/LC_MESSAGES/messages.po @@ -21,8 +21,13 @@ msgstr "Xác nhận Xóa Thanh toán tự động" #: DonationFundEditor.php:186 EditEventAttendees.php:76 #: ElectronicPaymentList.php:222 ElectronicPaymentList.php:288 #: EventNames.php:305 FamilyCustomFieldsEditor.php:334 +<<<<<<< HEAD #: FamilyCustomFieldsEditor.php:392 FamilyView.php:645 FamilyView.php:697 #: FamilyView.php:755 FamilyView.php:892 FindDepositSlip.php:108 +======= +#: FamilyCustomFieldsEditor.php:392 FamilyView.php:661 FamilyView.php:713 +#: FamilyView.php:772 FamilyView.php:909 FindDepositSlip.php:108 +>>>>>>> master #: FundRaiserEditor.php:204 ListEvents.php:250 PaddleNumList.php:60 #: PersonCustomFieldsEditor.php:318 PersonCustomFieldsEditor.php:387 #: PersonView.php:908 PledgeDelete.php:57 PropertyList.php:69 @@ -31,11 +36,19 @@ msgstr "Xác nhận Xóa Thanh toán tự động" msgid "Delete" msgstr "Xóa bỏ" +<<<<<<< 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 @@ -43,17 +56,29 @@ msgstr "Xóa bỏ" #: 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 "Hủy bỏ" +<<<<<<< HEAD #: AutoPaymentEditor.php:131 msgid "Automatic payment configuration for the " msgstr "Cấu hình thanh toán tự động cho " #: AutoPaymentEditor.php:582 CanvassEditor.php:242 DepositSlipEditor.php:98 +======= +#: AutoPaymentEditor.php:133 +msgid "Automatic payment configuration for the " +msgstr "Cấu hình thanh toán tự động cho " + +#: 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 @@ -66,7 +91,11 @@ msgstr "Cấu hình thanh toán tự động cho " msgid "Save" msgstr "Lưu lại" +<<<<<<< HEAD #: AutoPaymentEditor.php:599 BatchWinnerEntry.php:87 BatchWinnerEntry.php:99 +======= +#: AutoPaymentEditor.php:808 BatchWinnerEntry.php:87 BatchWinnerEntry.php:99 +>>>>>>> master #: 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 @@ -78,6 +107,7 @@ msgstr "Lưu lại" msgid "Unassigned" msgstr "Không gán" +<<<<<<< HEAD #: AutoPaymentEditor.php:619 msgid "Automatic payment type" msgstr "Loại hình thanh toán tự động" @@ -91,36 +121,71 @@ msgid "Payment interval (months)" msgstr "Khoảng thời gian thanh toán (tháng)" #: AutoPaymentEditor.php:657 CartToGroup.php:80 EditEventTypes.php:91 +======= +#: AutoPaymentEditor.php:828 +msgid "Automatic payment type" +msgstr "Loại hình thanh toán tự động" + +#: AutoPaymentEditor.php:858 +msgid "Payment amount" +msgstr "Số tiền thanh toán" + +#: AutoPaymentEditor.php:863 +msgid "Payment interval (months)" +msgstr "Khoảng thời gian thanh toán (tháng)" + +#: 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 "Không có" +<<<<<<< HEAD #: AutoPaymentEditor.php:670 msgid "inactive" msgstr "Không hoạt động" #: AutoPaymentEditor.php:700 CartToFamily.php:249 CSVExport.php:115 +======= +#: AutoPaymentEditor.php:884 +msgid "inactive" +msgstr "Không hoạt động" + +#: 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 "Thành phố" +<<<<<<< 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 "Quận/Huyện" +<<<<<<< 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 "Quốc gia " +<<<<<<< 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 @@ -128,30 +193,48 @@ msgstr "Quốc gia " msgid "Phone" msgstr "Điện thoại" +<<<<<<< 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 "E-mail" +<<<<<<< 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 "Thẻ tín dụng" +<<<<<<< HEAD #: AutoPaymentEditor.php:745 msgid "Expiration Month" msgstr "Tháng hết hạn" @@ -169,6 +252,25 @@ msgid "Bank Route Number" msgstr "Mã số Ngân hàng" #: AutoPaymentEditor.php:765 +======= +#: AutoPaymentEditor.php:969 +msgid "Expiration Month" +msgstr "Tháng hết hạn" + +#: AutoPaymentEditor.php:975 +msgid "Expiration Year" +msgstr "Năm Hết hạn" + +#: AutoPaymentEditor.php:981 +msgid "Bank Name" +msgstr "Tên ngân hàng" + +#: AutoPaymentEditor.php:987 +msgid "Bank Route Number" +msgstr "Mã số Ngân hàng" + +#: AutoPaymentEditor.php:993 +>>>>>>> master msgid "Bank Account Number" msgstr "Số tài khoản ngân hàng" @@ -238,10 +340,17 @@ msgstr "Xuất CSV" msgid "Field Selection" msgstr "Lựa chọn trường" +<<<<<<< HEAD #: AutoPaymentEditor.php:685 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:182 +======= +#: 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 +>>>>>>> master #, fuzzy msgid "Last Name" msgstr "Họ" @@ -250,10 +359,17 @@ msgstr "Họ" msgid "Required" msgstr "Bắt buộc" +<<<<<<< HEAD #: AutoPaymentEditor.php:680 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:181 +======= +#: 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 +>>>>>>> master #, fuzzy msgid "First Name" msgstr "Tên" @@ -263,7 +379,11 @@ msgstr "Tên" msgid "Middle Name" msgstr "Tên đệm" +<<<<<<< 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 @@ -299,7 +419,11 @@ msgstr "Ngày sinh / Kỷ niệm" msgid "Age / Years Married" msgstr "Tuổi / năm kết hôn" +<<<<<<< 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 #, fuzzy msgid "Family Role" @@ -411,9 +535,15 @@ msgstr "Giới tính" #: 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 @@ -423,8 +553,13 @@ msgid "Home Phone" msgstr "Điện thoại nhà" #: 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 @@ -432,8 +567,13 @@ msgid "Work Phone" msgstr "Điện thoại công việc" #: 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" @@ -445,13 +585,22 @@ msgstr "Email làm việc/khác" #: 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 "Năm sinh" #: 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 "Ngày cưới" @@ -471,7 +620,11 @@ msgstr "LƯU Ý: Phân tách bằng (dấu gạch ngang, vv) hoặc thiếu dấ msgid "Default country if none specified otherwise" msgstr "Quốc gia mặc định nếu không có quy định khác" +<<<<<<< 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" @@ -597,11 +750,19 @@ msgstr "Không có tên gia đình được nhập vào!" msgid "Add Cart to Family" msgstr "Thêm vào giỏ hàng rồi gửi đến Gia đình" +<<<<<<< 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 #: EventNames.php:266 FamilyCustomFieldsEditor.php:330 #: FamilyCustomFieldsEditor.php:444 FamilyList.php:43 FamilyView.php:535 +======= +#: 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:330 +#: FamilyCustomFieldsEditor.php:444 FamilyList.php:43 FamilyView.php:548 +>>>>>>> master #: GeoPage.php:385 GroupEditor.php:77 GroupPropsFormEditor.php:284 #: GroupPropsFormEditor.php:396 GroupView.php:321 GroupView.php:355 #: PersonCustomFieldsEditor.php:314 PersonCustomFieldsEditor.php:445 @@ -677,6 +838,7 @@ msgstr "Thêm vào Ban/Mục vụ" msgid "Create a New Group" msgstr "Tạo Ban/Mục vụ mới" +<<<<<<< HEAD #: CartView.php:42 msgid "View Your Cart" msgstr "Xem giỏ hàng" @@ -686,6 +848,17 @@ msgid "You have no items in your cart." msgstr "Bạn không có gì trong giỏ hàng" #: CartView.php:59 +======= +#: CartView.php:41 +msgid "View Your Cart" +msgstr "Xem giỏ hàng" + +#: CartView.php:49 +msgid "You have no items in your cart." +msgstr "Bạn không có gì trong giỏ hàng" + +#: CartView.php:58 +>>>>>>> master msgid "Back to Menu" msgstr "Quay lại Menu" @@ -693,19 +866,32 @@ msgstr "Quay lại Menu" msgid "Empty Cart" msgstr "Xóa bỏ giỏ hàng" +<<<<<<< HEAD #: 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: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 "Xóa bỏ" +<<<<<<< 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 "Có" +<<<<<<< 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" @@ -720,7 +906,11 @@ msgstr "Lựa chọn sự kiện" msgid "Action" msgstr "Hành động" +<<<<<<< HEAD #: Checkin.php:480 Include/Functions.php:1658 Reports/CanvassReports.php:245 +======= +#: Checkin.php:472 Include/Functions.php:1658 Reports/CanvassReports.php:245 +>>>>>>> master #: Reports/VotingMembers.php:88 queryparameteroptions_qpo.php:15 msgid "Member" msgstr "Thành viên" @@ -729,21 +919,35 @@ msgstr "Thành viên" msgid "Which role is the head of household?" msgstr "Ai giữ vai trò là chủ hộ ?" +<<<<<<< HEAD #: AutoPaymentEditor.php:690 AutoPaymentEditor.php:695 CartToFamily.php:239 #: CartToFamily.php:244 CartView.php:287 CSVExport.php:105 CSVExport.php:110 +======= +#: 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 "Địa chỉ" #: 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" @@ -754,7 +958,11 @@ msgid "Family Cell Phone" msgstr "Điện thoại gia đình" #: 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 "Email gia đình" @@ -805,11 +1013,19 @@ msgstr "Lưu thay đổi" msgid "Save Name" msgstr "Lưu lại tên" +<<<<<<< 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 @@ -818,7 +1034,11 @@ msgid "Family" msgstr "Gia đình" #: ElectronicPaymentList.php:199 FamilyCustomFieldsEditor.php:329 +<<<<<<< HEAD #: FamilyCustomFieldsEditor.php:431 FamilyView.php:534 FamilyView.php:639 +======= +#: FamilyCustomFieldsEditor.php:431 FamilyView.php:547 FamilyView.php:655 +>>>>>>> master #: 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 @@ -832,8 +1052,13 @@ msgid "Year" msgstr "Năm" #: 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 @@ -953,7 +1178,11 @@ msgid "Contact Info" msgstr "Thông tin liên hệ" #: 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 "Thành viên gia đình" @@ -970,7 +1199,11 @@ msgstr "Tên đệm" msgid "Last" msgstr "Họ" +<<<<<<< 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" @@ -1045,7 +1278,11 @@ msgstr "Tháng 11" msgid "December" msgstr "Tháng 12" +<<<<<<< HEAD #: FamilyList.php:29 FamilyView.php:312 +======= +#: FamilyList.php:29 FamilyView.php:319 +>>>>>>> master msgid "Family List" msgstr "Danh sách gia đình" @@ -1054,7 +1291,11 @@ msgid "Add Family" msgstr "Thêm gia đình" #: ChurchCRM/model/ChurchCRM/Person.php:103 FamilyEditor.php:436 +<<<<<<< HEAD #: FamilyList.php:48 Menu.php:205 PersonEditor.php:380 +======= +#: FamilyList.php:48 Menu.php:211 PersonEditor.php:380 +>>>>>>> master msgid "Created" msgstr "Đã tạo" @@ -1066,6 +1307,7 @@ msgstr "Đã sửa" msgid "Family View" msgstr "Xem gia đình" +<<<<<<< HEAD #: FamilyView.php:304 msgid "Add New Member" msgstr "Thêm thành viên mới" @@ -1087,10 +1329,34 @@ msgid "No property assignments." msgstr "Không có thuộc tính nào được gán vào đây" #: FamilyView.php:536 GroupView.php:356 PersonView.php:655 PrintView.php:451 +======= +#: FamilyView.php:311 +msgid "Add New Member" +msgstr "Thêm thành viên mới" + +#: FamilyView.php:338 PersonView.php:353 +msgid "Add a Note" +msgstr "Thêm ghi chú" + +#: FamilyView.php:343 +msgid "Add All Family Members to Cart" +msgstr "Thêm tất cả thành viên trong gia đình vào giỏ hàng" + +#: FamilyView.php:447 PersonView.php:379 +msgid "Timeline" +msgstr "Dòng thời gian" + +#: FamilyView.php:540 PersonView.php:647 PrintView.php:446 +msgid "No property assignments." +msgstr "Không có thuộc tính nào được gán vào đây" + +#: FamilyView.php:549 GroupView.php:356 PersonView.php:655 PrintView.php:451 +>>>>>>> master #: PropertyAssign.php:180 SystemSettings.php:152 msgid "Value" msgstr "Giá trị" +<<<<<<< HEAD #: FamilyView.php:539 FamilyView.php:577 GroupView.php:359 GroupView.php:395 msgid "Edit Value" msgstr "Chỉnh sửa giá trị" @@ -1113,12 +1379,40 @@ msgstr "Cập nhật" #: AutoPaymentEditor.php:632 CanvassEditor.php:198 DepositSlipEditor.php:82 #: EditEventAttendees.php:33 FamilyView.php:748 FindFundRaiser.php:241 +======= +#: FamilyView.php:552 FamilyView.php:590 GroupView.php:359 GroupView.php:395 +msgid "Edit Value" +msgstr "Chỉnh sửa giá trị" + +#: FamilyView.php:613 PersonView.php:688 +msgid "Assign a New Property" +msgstr "Gán thuộc tính mới" + +#: FamilyView.php:662 FamilyView.php:773 SelectDelete.php:222 +msgid "Date Updated" +msgstr "Ngày cập nhật" + +#: FamilyView.php:663 FamilyView.php:774 SelectDelete.php:223 +msgid "Updated By" +msgstr "Cập nhật bởi" + +#: FamilyView.php:754 MemberRoleChange.php:120 PropertyAssign.php:191 +msgid "Update" +msgstr "Cập nhật" + +#: 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 "Ngày" +<<<<<<< HEAD #: FamilyView.php:753 PledgeEditor.php:725 SelectDelete.php:221 +======= +#: FamilyView.php:770 PledgeEditor.php:725 SelectDelete.php:221 +>>>>>>> master msgid "Comment" msgstr "Bình luận" @@ -1127,11 +1421,19 @@ msgstr "Bình luận" msgid "Close" msgstr "Đóng lại" +<<<<<<< HEAD #: FamilyView.php:947 msgid "Oops! Family not found." msgstr "Oh, không tìm thấy gia đình này" #: FamilyView.php:951 PersonView.php:1013 +======= +#: FamilyView.php:967 +msgid "Oops! Family not found." +msgstr "Oh, không tìm thấy gia đình này" + +#: FamilyView.php:971 PersonView.php:1007 +>>>>>>> master msgid "return to member dashboard" msgstr "Quay lại bảng điều khiển thành viên" @@ -1170,7 +1472,11 @@ msgstr "Địa chỉ Hội Thánh" msgid "Sort Data by:" msgstr "Sắp xếp dữ liệu theo" +<<<<<<< HEAD #: FinancialReports.php:304 menuconfig_mcf.php:20 +======= +#: FinancialReports.php:304 menuconfig_mcf.php:21 +>>>>>>> master msgid "Deposit" msgstr "Khoản " @@ -1327,7 +1633,11 @@ msgstr "Tổng số thành viên" msgid "Default Role" msgstr "Vai trò mặc định" +<<<<<<< HEAD #: FamilyView.php:438 GroupView.php:342 PersonView.php:382 PrintView.php:435 +======= +#: FamilyView.php:449 GroupView.php:342 PersonView.php:382 PrintView.php:435 +>>>>>>> master msgid "Assigned Properties" msgstr "Thuộc tính được chỉ định" @@ -1367,6 +1677,7 @@ msgstr "Hiển thị sự kiện trong năm" msgid "Start Date/Time" msgstr "Thời gian/ngày bắt đầu" +<<<<<<< HEAD #: Login.php:162 msgid "Please Login" msgstr "Vui lòng đăng nhập" @@ -1385,6 +1696,26 @@ msgstr "Đăng nhập" #: external/templates/verify/verify-family-info.php:13 #: external/templates/verify/verify-family-info.php:122 +======= +#: Login.php:159 +msgid "Please Login" +msgstr "Vui lòng đăng nhập" + +#: ChurchCRM/Emails/users/BaseUserEmail.php:30 Login.php:179 +msgid "Email/Username" +msgstr "Email/Tài khoản" + +#: BackupDatabase.php:76 Login.php:184 UserList.php:56 +msgid "Password" +msgstr "Mật khẩu" + +#: Login.php:147 Login.php:198 +msgid "Login" +msgstr "Đăng nhập" + +#: external/templates/verify/verify-family-info.php:14 +#: external/templates/verify/verify-family-info.php:132 +>>>>>>> master #: ManageEnvelopes.php:138 msgid "Confirm" msgstr "Xác nhận" @@ -1492,26 +1823,46 @@ msgid "Latest Families" msgstr "Gia đình mới thêm" #: 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 "Tên gia đình" +<<<<<<< HEAD #: Menu.php:231 msgid "Updated Families" msgstr "Gia đình vừa cập nhật" #: ChurchCRM/model/ChurchCRM/Person.php:108 FamilyEditor.php:471 Menu.php:240 +======= +#: Menu.php:237 +msgid "Updated Families" +msgstr "Gia đình vừa cập nhật" + +#: ChurchCRM/model/ChurchCRM/Person.php:108 FamilyEditor.php:471 Menu.php:252 +>>>>>>> master #: PersonEditor.php:384 msgid "Updated" msgstr "Đã cập nhật" +<<<<<<< HEAD #: Menu.php:268 msgid "Latest Members" msgstr "Thành viên mới nhất" #: Menu.php:303 +======= +#: Menu.php:280 +msgid "Latest Members" +msgstr "Thành viên mới nhất" + +#: Menu.php:315 +>>>>>>> master msgid "Updated Members" msgstr "Đã cập nhật thành viên" @@ -1655,7 +2006,11 @@ msgstr "Đồng ý thêm vào" msgid "No volunteer opportunity assignments." msgstr "Không có công việc nào được giao cho cộng tác viên" +<<<<<<< HEAD #: PersonView.php:1010 +======= +#: PersonView.php:1004 +>>>>>>> master msgid "Oops! Person not found." msgstr "Oh không tìm thấy người này" @@ -1669,7 +2024,11 @@ msgstr "Xem bản in" #: PrintView.php:325 Reports/CanvassReports.php:244 #: sundayschool/SundaySchoolClassView.php:201 +<<<<<<< HEAD #: sundayschool/SundaySchoolDashboard.php:184 +======= +#: sundayschool/SundaySchoolDashboard.php:196 +>>>>>>> master msgid "Age" msgstr "Tuổi" @@ -1685,7 +2044,11 @@ msgstr "Tên Ban/Mục vụ" msgid "Notes:" msgstr "Ghi chú:" +<<<<<<< HEAD #: ChurchCRM/Service/TimelineService.php:124 PrintView.php:484 +======= +#: ChurchCRM/Service/TimelineService.php:126 PrintView.php:484 +>>>>>>> master msgid "by" msgstr "bởi" @@ -1799,7 +2162,11 @@ msgstr "In ấn" msgid "Save Settings" msgstr "Lưu thay đổi" +<<<<<<< HEAD #: ChurchCRM/dto/SystemConfig.php:221 Include/Footer.php:144 +======= +#: ChurchCRM/dto/SystemConfig.php:222 Include/Footer.php:144 +>>>>>>> master #: SystemSettings.php:43 msgid "System Settings" msgstr "Cài đặt hệ thống" @@ -1933,13 +2300,21 @@ msgid "Work" msgstr "Công việc" #: 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 "Trường Chúa Nhật" #: sundayschool/SundaySchoolClassView.php:120 #: sundayschool/SundaySchoolDashboard.php:80 +<<<<<<< HEAD #: sundayschool/SundaySchoolDashboard.php:146 +======= +#: sundayschool/SundaySchoolDashboard.php:152 +>>>>>>> master msgid "Teachers" msgstr "Giáo viên" @@ -1949,7 +2324,11 @@ msgstr "Ngày sinh theo tháng" #: sundayschool/SundaySchoolClassView.php:191 #: sundayschool/SundaySchoolDashboard.php:91 +<<<<<<< HEAD #: sundayschool/SundaySchoolDashboard.php:147 +======= +#: sundayschool/SundaySchoolDashboard.php:153 +>>>>>>> master msgid "Students" msgstr "Học sinh" @@ -2005,11 +2384,15 @@ msgstr "Xem tất cả thành viên" msgid "Add New Family" msgstr "Thêm gia đình mới" +<<<<<<< HEAD #: menuconfig_mcf.php:9 msgid "View All Families" msgstr "Xem tất cả gia đình" #: menuconfig_mcf.php:15 +======= +#: menuconfig_mcf.php:16 +>>>>>>> master msgid "Events" msgstr "Sự kiện" @@ -2029,7 +2412,11 @@ msgstr "Chào mừng bạn đến với" msgid "Login to restored Database" msgstr "Đăng nhập để phục hồi cơ sở dữ liệu" +<<<<<<< HEAD #: ChurchCRM/dto/SystemConfig.php:214 +======= +#: ChurchCRM/dto/SystemConfig.php:215 +>>>>>>> master msgid "Church Information" msgstr "Thông tin Hội Thánh" @@ -2045,7 +2432,11 @@ msgstr "Đăng nhập để nâng cấp hệ thống" msgid "Add New Class" msgstr "Thêm lớp mới" +<<<<<<< HEAD #: Login.php:167 +======= +#: Login.php:164 +>>>>>>> master msgid "Your previous session timed out. Please login again." msgstr "Phiên truy cập trước đã hết thời gian, vui lòng đăng nhập lại." @@ -2098,11 +2489,19 @@ msgstr "Gán thuộc tính mới:" msgid "Family Map" msgstr "Bản đồ gia đình" +<<<<<<< HEAD #: MembersDashboard.php:198 Menu.php:130 menuconfig_mcf.php:10 msgid "Groups" msgstr "Ban/Mục vụ" #: menuconfig_mcf.php:11 +======= +#: MembersDashboard.php:198 Menu.php:130 menuconfig_mcf.php:11 +msgid "Groups" +msgstr "Ban/Mục vụ" + +#: menuconfig_mcf.php:12 +>>>>>>> master msgid "List Groups" msgstr "Danh sách Ban/Mục vụ" @@ -2110,11 +2509,19 @@ msgstr "Danh sách Ban/Mục vụ" msgid "Edit Group Types" msgstr "Chỉnh sửa Thể loại Ban/Mục vụ" +<<<<<<< HEAD #: menuconfig_mcf.php:22 msgid "View All Deposits" msgstr "Xem tất cả khoản thu" #: menuconfig_mcf.php:26 +======= +#: menuconfig_mcf.php:23 +msgid "View All Deposits" +msgstr "Xem tất cả khoản thu" + +#: menuconfig_mcf.php:27 +>>>>>>> master msgid "View All Fundraisers" msgstr "Xem tất cả khoản đóng góp" @@ -2180,7 +2587,11 @@ msgstr "Thêm vào giỏ" msgid "Remove From Cart" msgstr "Xóa khỏi giỏ" +<<<<<<< HEAD #: FamilyView.php:606 PersonView.php:696 QueryView.php:322 +======= +#: FamilyView.php:619 PersonView.php:696 QueryView.php:322 +>>>>>>> master msgid "select an option" msgstr "lựa chọn giá trị này" @@ -2196,6 +2607,17 @@ msgstr "Trạng thái" msgid "Email export" msgstr "Email xuất ra" +<<<<<<< HEAD +======= +#: menuconfig_mcf.php:9 +msgid "View Active Families" +msgstr "Xem gia đình đang hoạt động" + +#: menuconfig_mcf.php:10 +msgid "View Inactive Families" +msgstr "Xem gia đình không hoạt động" + +>>>>>>> master #: DirectoryReports.php:78 msgid "Exclude Inactive Families" msgstr "Ngoại trừ gia đình không hoạt động" diff --git a/src/locale/zh_CN/LC_MESSAGES/messages.po b/src/locale/zh_CN/LC_MESSAGES/messages.po index 75941ba361..2397277e52 100644 --- a/src/locale/zh_CN/LC_MESSAGES/messages.po +++ b/src/locale/zh_CN/LC_MESSAGES/messages.po @@ -21,8 +21,13 @@ msgstr "确认删除自动付款" #: DonationFundEditor.php:186 EditEventAttendees.php:76 #: ElectronicPaymentList.php:222 ElectronicPaymentList.php:288 #: EventNames.php:305 FamilyCustomFieldsEditor.php:334 +<<<<<<< HEAD #: FamilyCustomFieldsEditor.php:392 FamilyView.php:645 FamilyView.php:697 #: FamilyView.php:755 FamilyView.php:892 FindDepositSlip.php:108 +======= +#: FamilyCustomFieldsEditor.php:392 FamilyView.php:661 FamilyView.php:713 +#: FamilyView.php:772 FamilyView.php:909 FindDepositSlip.php:108 +>>>>>>> master #: FundRaiserEditor.php:204 ListEvents.php:250 PaddleNumList.php:60 #: PersonCustomFieldsEditor.php:318 PersonCustomFieldsEditor.php:387 #: PersonView.php:908 PledgeDelete.php:57 PropertyList.php:69 @@ -31,11 +36,19 @@ msgstr "确认删除自动付款" 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 @@ -43,17 +56,29 @@ 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: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 @@ -66,7 +91,11 @@ msgstr "自动付款配置" msgid "Save" msgstr "保存" +<<<<<<< HEAD #: AutoPaymentEditor.php:599 BatchWinnerEntry.php:87 BatchWinnerEntry.php:99 +======= +#: AutoPaymentEditor.php:808 BatchWinnerEntry.php:87 BatchWinnerEntry.php:99 +>>>>>>> master #: 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 @@ -78,6 +107,7 @@ msgstr "保存" msgid "Unassigned" msgstr "未分配" +<<<<<<< HEAD #: AutoPaymentEditor.php:619 msgid "Automatic payment type" msgstr "自动付款类型" @@ -91,36 +121,71 @@ msgid "Payment interval (months)" msgstr "付款的时间间隔（月）" #: AutoPaymentEditor.php:657 CartToGroup.php:80 EditEventTypes.php:91 +======= +#: AutoPaymentEditor.php:828 +msgid "Automatic payment type" +msgstr "自动付款类型" + +#: AutoPaymentEditor.php:858 +msgid "Payment amount" +msgstr "付款金额" + +#: AutoPaymentEditor.php:863 +msgid "Payment interval (months)" +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 "待用" #: AutoPaymentEditor.php:700 CartToFamily.php:249 CSVExport.php:115 +======= +#: AutoPaymentEditor.php:884 +msgid "inactive" +msgstr "待用" + +#: 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: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 @@ -128,30 +193,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:745 msgid "Expiration Month" msgstr "到期月份" @@ -169,6 +252,25 @@ msgid "Bank Route Number" msgstr "银行路由号码" #: AutoPaymentEditor.php:765 +======= +#: 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 +>>>>>>> master msgid "Bank Account Number" msgstr "银行帐户号码" @@ -234,10 +336,17 @@ msgstr "输入获奖者" msgid "CSV Export" msgstr "CSV出口" +<<<<<<< HEAD #: AutoPaymentEditor.php:685 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:182 +======= +#: 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 +>>>>>>> master #, fuzzy msgid "Last Name" msgstr "姓氏" @@ -246,10 +355,17 @@ msgstr "姓氏" msgid "Required" msgstr "需要" +<<<<<<< HEAD #: AutoPaymentEditor.php:680 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:181 +======= +#: 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 +>>>>>>> master #, fuzzy msgid "First Name" msgstr "产品名称" @@ -259,7 +375,11 @@ msgstr "产品名称" msgid "Middle Name" 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 @@ -296,7 +416,11 @@ msgstr "生日/纪念日日期" msgid "Age / Years Married" 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 #, fuzzy msgid "Family Role" @@ -442,9 +566,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 @@ -454,8 +584,13 @@ msgid "Home Phone" 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 @@ -463,8 +598,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" @@ -476,13 +616,22 @@ 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 "出生日期" #: 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 "婚礼日期" @@ -514,7 +663,11 @@ msgstr "注：分离器（破折号等）或缺乏无所谓" msgid "Default country if none specified otherwise" 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" @@ -709,11 +862,19 @@ 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 #: EventNames.php:266 FamilyCustomFieldsEditor.php:330 #: FamilyCustomFieldsEditor.php:444 FamilyList.php:43 FamilyView.php:535 +======= +#: 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:330 +#: FamilyCustomFieldsEditor.php:444 FamilyList.php:43 FamilyView.php:548 +>>>>>>> master #: GeoPage.php:385 GroupEditor.php:77 GroupPropsFormEditor.php:284 #: GroupPropsFormEditor.php:396 GroupView.php:321 GroupView.php:355 #: PersonCustomFieldsEditor.php:314 PersonCustomFieldsEditor.php:445 @@ -795,19 +956,27 @@ 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 "返回目录" #: CartView.php:94 +======= +#: CartView.php:58 +msgid "Back to Menu" +msgstr "返回目录" + +#: CartView.php:93 +>>>>>>> master msgid "Go To Labels" msgstr "转至标签" @@ -815,6 +984,7 @@ msgstr "转至标签" msgid "Empty Cart" msgstr "清空购物车" +<<<<<<< HEAD #: CartView.php:113 Include/Header.php:131 msgid "Empty Cart to Group" msgstr "清空购物车集团" @@ -824,6 +994,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 "清空购物车事件" @@ -831,7 +1012,11 @@ msgstr "清空购物车事件" msgid "Map Cart" msgstr "地图购物车" +<<<<<<< HEAD #: CartView.php:129 +======= +#: CartView.php:135 +>>>>>>> master msgid "Name Tags" msgstr "名称标签" @@ -839,11 +1024,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 "电子邮件（BCC）" +<<<<<<< HEAD #: CartView.php:193 msgid "Create Directory From Cart" msgstr "创建目录从购物车中" @@ -870,17 +1060,53 @@ 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: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: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: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" @@ -899,7 +1125,11 @@ msgstr "选择事件时，你要检查的人" msgid "Select Event" msgstr "选择事件" +<<<<<<< HEAD #: external/templates/verify/verify-family-info.php:140 +======= +#: external/templates/verify/verify-family-info.php:150 +>>>>>>> master msgid "Verify" msgstr "验证" @@ -940,16 +1170,28 @@ msgstr "行动" msgid "No Attendees Assigned to Event" msgstr "没有分配给事件的参加者" +<<<<<<< HEAD #: Checkin.php:480 Include/Functions.php:1658 Reports/CanvassReports.php:245 +======= +#: Checkin.php:472 Include/Functions.php:1658 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 "的" #: 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:476 ChurchCRM/Service/PersonService.php:40 PersonView.php:267 +>>>>>>> master msgid "(No assigned family)" msgstr "（没有分配的家庭）" @@ -1026,21 +1268,35 @@ msgstr "哪个角色是个孩子吗？" msgid "Information to Include" msgstr "信息包括" +<<<<<<< HEAD #: AutoPaymentEditor.php:690 AutoPaymentEditor.php:695 CartToFamily.php:239 #: CartToFamily.php:244 CartView.php:287 CSVExport.php:105 CSVExport.php:110 +======= +#: 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 "地址" #: 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" @@ -1050,7 +1306,11 @@ msgstr "生日" msgid "Family Home Phone" msgstr "家庭电话" +<<<<<<< HEAD #: ChurchCRM/tasks/FamilyWorkPhoneTask.php:30 DirectoryReports.php:181 +======= +#: DirectoryReports.php:181 +>>>>>>> master msgid "Family Work Phone" msgstr "家庭办公电话" @@ -1059,7 +1319,11 @@ 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 "家庭电子邮件" @@ -1246,11 +1510,19 @@ msgstr "复发性模式" msgid "Attendance Counts" 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 @@ -1259,7 +1531,11 @@ msgid "Family" msgstr "家庭" #: ElectronicPaymentList.php:199 FamilyCustomFieldsEditor.php:329 +<<<<<<< HEAD #: FamilyCustomFieldsEditor.php:431 FamilyView.php:534 FamilyView.php:639 +======= +#: FamilyCustomFieldsEditor.php:431 FamilyView.php:547 FamilyView.php:655 +>>>>>>> master #: 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 @@ -1267,19 +1543,32 @@ msgstr "家庭" msgid "Type" 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 #: 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 "量" +<<<<<<< HEAD #: AutoPaymentEditor.php:654 ElectronicPaymentList.php:204 FamilyView.php:643 #: FamilyView.php:746 FinancialReports.php:305 SelectDelete.php:215 +======= +#: AutoPaymentEditor.php:868 ElectronicPaymentList.php:204 FamilyView.php:659 +#: FamilyView.php:763 FinancialReports.php:305 SelectDelete.php:215 +>>>>>>> master msgid "Fund" msgstr "基金" @@ -1298,8 +1587,13 @@ msgid "Year" 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 @@ -1569,7 +1863,11 @@ msgid "Custom Fields" 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 "家庭成员" @@ -1590,7 +1888,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" @@ -1673,15 +1975,24 @@ msgstr "安克" msgid "Family View" msgstr "家庭观" +<<<<<<< HEAD #: FamilyView.php:232 msgid "Latitude/Longitude" msgstr "纬度/经度" #: FamilyEditor.php:881 FamilyView.php:249 ManageEnvelopes.php:170 +======= +#: FamilyView.php:236 +msgid "Latitude/Longitude" +msgstr "纬度/经度" + +#: FamilyEditor.php:881 FamilyView.php:254 ManageEnvelopes.php:170 +>>>>>>> master #: PledgeEditor.php:528 msgid "Envelope Number" msgstr "信封号码" +<<<<<<< HEAD #: FamilyView.php:308 msgid "Previous Family" msgstr "上一页家庭" @@ -1707,24 +2018,64 @@ msgid "No property assignments." msgstr "没有财产的分配。" #: FamilyView.php:536 GroupView.php:356 PersonView.php:655 PrintView.php:451 +======= +#: FamilyView.php:315 +msgid "Previous Family" +msgstr "上一页家庭" + +#: FamilyView.php:323 +msgid "Next Family" +msgstr "下一个家庭" + +#: FamilyView.php:199 PersonView.php:197 +msgid "Upload Photo" +msgstr "上传照片" + +#: FamilyView.php:204 PersonView.php:201 +msgid "Delete Photo" +msgstr "删除照片" + +#: FamilyView.php:455 +msgid "Pledges and Payments" +msgstr "认捐和实付" + +#: FamilyView.php:540 PersonView.php:647 PrintView.php:446 +msgid "No property assignments." +msgstr "没有财产的分配。" + +#: 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 "编辑值" #: FamilyView.php:600 PersonView.php:688 +======= +#: FamilyView.php:552 FamilyView.php:590 GroupView.php:359 GroupView.php:395 +msgid "Edit Value" +msgstr "编辑值" + +#: FamilyView.php:613 PersonView.php:688 +>>>>>>> master #, fuzzy msgid "Assign a New Property" msgstr "分配一个新的属性" +<<<<<<< HEAD #: FamilyView.php:618 GroupView.php:433 PersonView.php:724 PersonView.php:810 +======= +#: 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 "下一个付款日期" @@ -1763,11 +2114,52 @@ msgstr "质押或付款" #: AutoPaymentEditor.php:632 CanvassEditor.php:198 DepositSlipEditor.php:82 #: EditEventAttendees.php:33 FamilyView.php:748 FindFundRaiser.php:241 +======= +#: 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:754 MemberRoleChange.php:120 PropertyAssign.php:191 +msgid "Update" +msgstr "更新" + +#: FamilyView.php:762 +msgid "Pledge or Payment" +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 #: FamilyView.php:750 msgid "NonDeductible" msgstr "不得扣除" @@ -1797,6 +2189,37 @@ msgid " Canvass Entry" msgstr "招商入口" #: DepositSlipEditor.php:223 FamilyView.php:880 FindDepositSlip.php:98 +======= +#: 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 "招商入口" + +#: DepositSlipEditor.php:223 FamilyView.php:897 FindDepositSlip.php:98 +>>>>>>> master #: PersonView.php:897 PledgeDelete.php:23 msgid "Confirm Delete" msgstr "确认删除" @@ -2375,7 +2798,11 @@ msgstr "组特定的属性" msgid "Disabled for this group." msgstr "这组停用。" +<<<<<<< HEAD #: FamilyView.php:438 GroupView.php:342 PersonView.php:382 PrintView.php:435 +======= +#: FamilyView.php:449 GroupView.php:342 PersonView.php:382 PrintView.php:435 +>>>>>>> master #, fuzzy msgid "Assigned Properties" msgstr "指定的属性" @@ -2437,6 +2864,7 @@ msgstr "无效的登录名或密码" msgid "Too many failed logins: your account has been locked. Please contact an administrator." msgstr "太多次失败登录您的帐户已被锁定。请与管理员联系。" +<<<<<<< HEAD #: Login.php:162 msgid "Please Login" msgstr "请登录" @@ -2446,6 +2874,17 @@ msgid "Password" msgstr "密码" #: Login.php:150 Login.php:207 +======= +#: Login.php:159 +msgid "Please Login" +msgstr "请登录" + +#: BackupDatabase.php:76 Login.php:184 UserList.php:56 +msgid "Password" +msgstr "密码" + +#: Login.php:147 Login.php:198 +>>>>>>> master msgid "Login" msgstr "注册" @@ -2457,8 +2896,13 @@ msgstr "信封经理" msgid "Update Family Records" 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 "确认" @@ -2527,7 +2971,11 @@ msgid "US Address Verification Report" 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" @@ -2872,7 +3320,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 "年龄" @@ -2893,7 +3345,7 @@ msgstr "注：" msgid "Entered:" msgstr "输入：" -#: ChurchCRM/Service/TimelineService.php:124 PrintView.php:484 +#: ChurchCRM/Service/TimelineService.php:126 PrintView.php:484 msgid "by" msgstr "通过" @@ -3003,8 +3455,13 @@ msgid "Add a New Property Type" 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 "类" @@ -3198,7 +3655,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 "集团转让助手" @@ -3310,11 +3771,19 @@ msgstr "日历年份" msgid "US Address Verification" msgstr "美国地址验证" +<<<<<<< HEAD #: UserList.php:118 msgid "User Delete Confirmation" msgstr "用户删除确认书，" #: UserList.php:120 +======= +#: UserList.php:121 +msgid "User Delete Confirmation" +msgstr "用户删除确认书，" + +#: UserList.php:123 +>>>>>>> master msgid "Please confirm removal of user status from:" msgstr "请确认删除的用户状态：" @@ -3492,7 +3961,11 @@ msgstr "新密码" msgid "Confirm New Password" msgstr "确认新密码" +<<<<<<< HEAD #: UserList.php:163 +======= +#: UserList.php:166 +>>>>>>> master #, fuzzy msgid "Please confirm the password reset of this user" msgstr "请确认该用户的密码重置" @@ -3825,8 +4298,13 @@ msgstr "联络" msgid "City, State, Zip" msgstr "市，州，邮政编码" +<<<<<<< HEAD #: 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:40 FamilyEditor.php:787 +#: FamilyView.php:241 Reports/ConfirmReportEmail.php:144 +>>>>>>> master #: Reports/ConfirmReport.php:145 msgid "Send Newsletter" msgstr "发送通讯" diff --git a/src/locale/zh_TW/LC_MESSAGES/messages.po b/src/locale/zh_TW/LC_MESSAGES/messages.po index 4f15fa2691..cccd82d945 100644 --- a/src/locale/zh_TW/LC_MESSAGES/messages.po +++ b/src/locale/zh_TW/LC_MESSAGES/messages.po @@ -21,8 +21,13 @@ msgstr "確認刪除自動付款" #: DonationFundEditor.php:186 EditEventAttendees.php:76 #: ElectronicPaymentList.php:222 ElectronicPaymentList.php:288 #: EventNames.php:305 FamilyCustomFieldsEditor.php:334 +<<<<<<< HEAD #: FamilyCustomFieldsEditor.php:392 FamilyView.php:645 FamilyView.php:697 #: FamilyView.php:755 FamilyView.php:892 FindDepositSlip.php:108 +======= +#: FamilyCustomFieldsEditor.php:392 FamilyView.php:661 FamilyView.php:713 +#: FamilyView.php:772 FamilyView.php:909 FindDepositSlip.php:108 +>>>>>>> master #: FundRaiserEditor.php:204 ListEvents.php:250 PaddleNumList.php:60 #: PersonCustomFieldsEditor.php:318 PersonCustomFieldsEditor.php:387 #: PersonView.php:908 PledgeDelete.php:57 PropertyList.php:69 @@ -31,11 +36,19 @@ msgstr "確認刪除自動付款" 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 @@ -43,17 +56,29 @@ 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: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 @@ -66,6 +91,10 @@ msgstr "自動付款配置" msgid "Save" msgstr "保存" +<<<<<<< HEAD +======= +#: AutoPaymentEditor.php:808 BatchWinnerEntry.php:87 BatchWinnerEntry.php:99 +>>>>>>> master #: 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 @@ -77,6 +106,7 @@ msgstr "保存" msgid "Unassigned" msgstr "未分配" +<<<<<<< HEAD #: AutoPaymentEditor.php:599 BatchWinnerEntry.php:87 BatchWinnerEntry.php:99 #: EditEventTypes.php:103 EventNames.php:109 EventNames.php:121 #: EventNames.php:166 GroupReports.php:52 GroupReports.php:147 @@ -97,27 +127,65 @@ msgid "Payment interval (months)" msgstr "付款的時間間隔（月）" #: AutoPaymentEditor.php:657 CartToGroup.php:80 EditEventTypes.php:91 +======= +#: AutoPaymentEditor.php:828 +msgid "Automatic payment type" +msgstr "自動付款類型" + +#: AutoPaymentEditor.php:858 +msgid "Payment amount" +msgstr "付款金額" + +#: AutoPaymentEditor.php:863 +msgid "Payment interval (months)" +msgstr "付款的時間間隔（月）" + +#: AutoPaymentEditor.php:871 CartToGroup.php:80 EditEventTypes.php:91 +#: 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 "無" + +#: AutoPaymentEditor.php:884 +msgid "inactive" +msgstr "待用" + +#: 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: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: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:670 msgid "inactive" msgstr "待用" #: AutoPaymentEditor.php:700 CartToFamily.php:249 CSVExport.php:115 +======= +#: 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 @@ -125,29 +193,47 @@ msgstr "待用" msgid "Phone" msgstr "電話" +<<<<<<< HEAD +======= +#: 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:705 CartToFamily.php:254 CSVExport.php:120 +======= +#: AutoPaymentEditor.php:952 ElectronicPaymentList.php:213 +>>>>>>> master #: FinancialReports.php:267 FindDepositSlip.php:52 PledgeEditor.php:592 msgid "Credit Card" msgstr "信用卡" +<<<<<<< HEAD #: AutoPaymentEditor.php:745 msgid "Expiration Month" msgstr "到期月份" @@ -165,6 +251,25 @@ msgid "Bank Route Number" msgstr "銀行路由號碼" #: AutoPaymentEditor.php:765 +======= +#: 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 +>>>>>>> master msgid "Bank Account Number" msgstr "銀行帳戶號碼" @@ -230,10 +335,17 @@ msgstr "輸入獲獎者" msgid "CSV Export" msgstr "CSV出口" +<<<<<<< HEAD #: AutoPaymentEditor.php:715 CartToFamily.php:274 CSVExport.php:135 #: external/templates/registration/family-register-members.php:73 #: external/templates/verify/enter-info.php:25 ManageEnvelopes.php:166 #: PersonEditor.php:630 sundayschool/SundaySchoolDashboard.php:182 +======= +#: 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 +>>>>>>> master #, fuzzy msgid "Last Name" msgstr "姓氏" @@ -242,10 +354,17 @@ msgstr "姓氏" msgid "Required" msgstr "需要" +<<<<<<< HEAD #: AutoPaymentEditor.php:720 ChurchCRM/Reports/PDF_Directory.php:312 #: external/templates/registration/family-register-members.php:69 #: external/templates/verify/enter-info.php:21 PersonEditor.php:608 #: sundayschool/SundaySchoolDashboard.php:181 +======= +#: 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 +>>>>>>> master #, fuzzy msgid "First Name" msgstr "產品名稱" @@ -255,7 +374,11 @@ msgstr "產品名稱" msgid "Middle Name" msgstr "中間名" +<<<<<<< HEAD #: AutoPaymentEditor.php:725 CartToFamily.php:315 CartView.php:288 +======= +#: 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 @@ -292,7 +415,11 @@ msgstr "生日/紀念日日期" msgid "Age / Years Married" 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 #, fuzzy msgid "Family Role" @@ -438,9 +565,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 @@ -450,8 +583,13 @@ msgid "Home Phone" 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 @@ -459,8 +597,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" @@ -472,13 +615,22 @@ 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 "出生日期" #: 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 "婚禮日期" @@ -510,7 +662,11 @@ msgstr "注：分離器（破折號等）或缺乏無所謂" msgid "Default country if none specified otherwise" 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" @@ -705,11 +861,19 @@ 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 #: EventNames.php:266 FamilyCustomFieldsEditor.php:330 #: FamilyCustomFieldsEditor.php:444 FamilyList.php:43 FamilyView.php:535 +======= +#: 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:330 +#: FamilyCustomFieldsEditor.php:444 FamilyList.php:43 FamilyView.php:548 +>>>>>>> master #: GeoPage.php:385 GroupEditor.php:77 GroupPropsFormEditor.php:284 #: GroupPropsFormEditor.php:396 GroupView.php:321 GroupView.php:355 #: PersonCustomFieldsEditor.php:314 PersonCustomFieldsEditor.php:445 @@ -791,19 +955,27 @@ 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 "返回目錄" #: CartView.php:94 +======= +#: CartView.php:58 +msgid "Back to Menu" +msgstr "返回目錄" + +#: CartView.php:93 +>>>>>>> master msgid "Go To Labels" msgstr "轉至標籤" @@ -811,6 +983,7 @@ msgstr "轉至標籤" msgid "Empty Cart" msgstr "清空購物車" +<<<<<<< HEAD #: CartView.php:113 Include/Header.php:131 msgid "Empty Cart to Group" msgstr "清空購物車集團" @@ -820,6 +993,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 "清空購物車事件" @@ -827,7 +1011,11 @@ msgstr "清空購物車事件" msgid "Map Cart" msgstr "地圖購物車" +<<<<<<< HEAD #: CartView.php:129 +======= +#: CartView.php:135 +>>>>>>> master msgid "Name Tags" msgstr "名稱標籤" @@ -835,11 +1023,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 "電子郵件（BCC）" +<<<<<<< HEAD #: CartView.php:193 msgid "Create Directory From Cart" msgstr "創建目錄從購物車中" @@ -866,17 +1059,53 @@ 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: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: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: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" @@ -895,7 +1124,11 @@ msgstr "選擇事件時，你要檢查的人" msgid "Select Event" msgstr "選擇事件" +<<<<<<< HEAD #: external/templates/verify/verify-family-info.php:140 +======= +#: external/templates/verify/verify-family-info.php:150 +>>>>>>> master msgid "Verify" msgstr "確認" @@ -936,16 +1169,28 @@ msgstr "行動" msgid "No Attendees Assigned to Event" msgstr "沒有分配給事件的參加者" +<<<<<<< HEAD #: Checkin.php:480 Include/Functions.php:1658 Reports/CanvassReports.php:245 +======= +#: Checkin.php:472 Include/Functions.php:1658 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 "的" #: 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:476 ChurchCRM/Service/PersonService.php:40 PersonView.php:267 +>>>>>>> master msgid "(No assigned family)" msgstr "（沒有分配的家庭）" @@ -1022,21 +1267,35 @@ msgstr "哪個角色是個孩子嗎？" msgid "Information to Include" msgstr "信息包括" +<<<<<<< HEAD #: AutoPaymentEditor.php:730 ElectronicPaymentList.php:213 #: CartToFamily.php:244 CartView.php:287 CSVExport.php:105 CSVExport.php:110 +======= +#: 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 "地址" #: 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" @@ -1046,7 +1305,11 @@ msgstr "生日" msgid "Family Home Phone" msgstr "家庭電話" +<<<<<<< HEAD #: ChurchCRM/tasks/FamilyWorkPhoneTask.php:30 DirectoryReports.php:181 +======= +#: DirectoryReports.php:181 +>>>>>>> master msgid "Family Work Phone" msgstr "家庭辦公電話" @@ -1055,7 +1318,11 @@ 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 "家庭電子郵件" @@ -1242,11 +1509,19 @@ msgstr "復發性模式" msgid "Attendance Counts" msgstr "出席計數" +<<<<<<< HEAD #: AutoPaymentEditor.php:685 CSVExport.php:79 CSVImport.php:217 #: 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 @@ -1255,7 +1530,11 @@ msgid "Family" msgstr "家庭" #: ElectronicPaymentList.php:199 FamilyCustomFieldsEditor.php:329 +<<<<<<< HEAD #: FamilyCustomFieldsEditor.php:431 FamilyView.php:534 FamilyView.php:639 +======= +#: FamilyCustomFieldsEditor.php:431 FamilyView.php:547 FamilyView.php:655 +>>>>>>> master #: 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 @@ -1263,19 +1542,32 @@ msgstr "家庭" msgid "Type" msgstr "類型" +<<<<<<< HEAD #: AutoPaymentEditor.php:680 CSVExport.php:90 CSVImport.php:215 +======= +#: 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 #: 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 "量" +<<<<<<< HEAD #: AutoPaymentEditor.php:710 BackupDatabase.php:67 CartToFamily.php:266 #: FamilyView.php:746 FinancialReports.php:305 SelectDelete.php:215 +======= +#: AutoPaymentEditor.php:868 ElectronicPaymentList.php:204 FamilyView.php:659 +#: FamilyView.php:763 FinancialReports.php:305 SelectDelete.php:215 +>>>>>>> master msgid "Fund" msgstr "基金" @@ -1294,8 +1586,13 @@ msgid "Year" 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 @@ -1565,7 +1862,11 @@ msgid "Custom Fields" 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 "家庭成員" @@ -1586,7 +1887,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" @@ -1669,15 +1974,24 @@ msgstr "安克" msgid "Family View" msgstr "家庭觀" +<<<<<<< HEAD #: FamilyView.php:232 msgid "Latitude/Longitude" msgstr "緯度/經度" #: FamilyEditor.php:881 FamilyView.php:249 ManageEnvelopes.php:170 +======= +#: FamilyView.php:236 +msgid "Latitude/Longitude" +msgstr "緯度/經度" + +#: FamilyEditor.php:881 FamilyView.php:254 ManageEnvelopes.php:170 +>>>>>>> master #: PledgeEditor.php:528 msgid "Envelope Number" msgstr "信封號碼" +<<<<<<< HEAD #: FamilyView.php:308 msgid "Previous Family" msgstr "上一頁家庭" @@ -1703,24 +2017,64 @@ msgid "No property assignments." msgstr "沒有財產的分配。" #: FamilyView.php:536 GroupView.php:356 PersonView.php:655 PrintView.php:451 +======= +#: FamilyView.php:315 +msgid "Previous Family" +msgstr "上一頁家庭" + +#: FamilyView.php:323 +msgid "Next Family" +msgstr "下一個家庭" + +#: FamilyView.php:199 PersonView.php:197 +msgid "Upload Photo" +msgstr "上傳照片" + +#: FamilyView.php:204 PersonView.php:201 +msgid "Delete Photo" +msgstr "刪除照片" + +#: FamilyView.php:455 +msgid "Pledges and Payments" +msgstr "認捐和實付" + +#: FamilyView.php:540 PersonView.php:647 PrintView.php:446 +msgid "No property assignments." +msgstr "沒有財產的分配。" + +#: 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 "編輯值" #: FamilyView.php:600 PersonView.php:688 +======= +#: FamilyView.php:552 FamilyView.php:590 GroupView.php:359 GroupView.php:395 +msgid "Edit Value" +msgstr "編輯值" + +#: FamilyView.php:613 PersonView.php:688 +>>>>>>> master #, fuzzy msgid "Assign a New Property" msgstr "分配一個新的屬性" +<<<<<<< HEAD #: FamilyView.php:618 GroupView.php:433 PersonView.php:724 PersonView.php:810 +======= +#: 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 "下一個付款日期" @@ -1759,11 +2113,52 @@ msgstr "質押或付款" #: AutoPaymentEditor.php:690 AutoPaymentEditor.php:695 CartToFamily.php:239 #: EditEventAttendees.php:33 FamilyView.php:748 FindFundRaiser.php:241 +======= +#: 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:754 MemberRoleChange.php:120 PropertyAssign.php:191 +msgid "Update" +msgstr "更新" + +#: FamilyView.php:762 +msgid "Pledge or Payment" +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 #: FamilyView.php:750 msgid "NonDeductible" msgstr "不得扣除" @@ -1793,6 +2188,37 @@ msgid " Canvass Entry" msgstr "招商入口" #: DepositSlipEditor.php:223 FamilyView.php:880 FindDepositSlip.php:98 +======= +#: 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 "招商入口" + +#: DepositSlipEditor.php:223 FamilyView.php:897 FindDepositSlip.php:98 +>>>>>>> master #: PersonView.php:897 PledgeDelete.php:23 msgid "Confirm Delete" msgstr "確認刪除" @@ -2371,7 +2797,11 @@ msgstr "組特定的屬性" msgid "Disabled for this group." msgstr "這組停用。" +<<<<<<< HEAD #: FamilyView.php:438 GroupView.php:342 PersonView.php:382 PrintView.php:435 +======= +#: FamilyView.php:449 GroupView.php:342 PersonView.php:382 PrintView.php:435 +>>>>>>> master #, fuzzy msgid "Assigned Properties" msgstr "指定的屬性" @@ -2433,6 +2863,7 @@ msgstr "無效的登錄名或密碼" msgid "Too many failed logins: your account has been locked. Please contact an administrator." msgstr "太多次失敗登錄您的帳戶已被鎖定。請與管理員聯繫。" +<<<<<<< HEAD #: Login.php:162 msgid "Please Login" msgstr "請登錄" @@ -2442,6 +2873,17 @@ msgid "Password" msgstr "密碼" #: Login.php:150 Login.php:207 +======= +#: Login.php:159 +msgid "Please Login" +msgstr "請登錄" + +#: BackupDatabase.php:76 Login.php:184 UserList.php:56 +msgid "Password" +msgstr "密碼" + +#: Login.php:147 Login.php:198 +>>>>>>> master msgid "Login" msgstr "註冊" @@ -2453,8 +2895,13 @@ msgstr "信封經理" msgid "Update Family Records" 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 "確認" @@ -2523,7 +2970,11 @@ msgid "US Address Verification Report" 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" @@ -2868,7 +3319,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 "年齡" @@ -2889,7 +3344,7 @@ msgstr "注：" msgid "Entered:" msgstr "輸入：" -#: ChurchCRM/Service/TimelineService.php:124 PrintView.php:484 +#: ChurchCRM/Service/TimelineService.php:126 PrintView.php:484 msgid "by" msgstr "通過" @@ -2999,8 +3454,13 @@ msgid "Add a New Property Type" 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 "類" @@ -3194,7 +3654,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 "集團轉讓助手" @@ -3306,11 +3770,19 @@ msgstr "日曆年份" msgid "US Address Verification" msgstr "美國地址驗證" +<<<<<<< HEAD #: UserList.php:118 msgid "User Delete Confirmation" msgstr "用戶刪除確認書，" #: UserList.php:120 +======= +#: UserList.php:121 +msgid "User Delete Confirmation" +msgstr "用戶刪除確認書，" + +#: UserList.php:123 +>>>>>>> master msgid "Please confirm removal of user status from:" msgstr "請確認刪除的用戶狀態：" @@ -3488,7 +3960,11 @@ msgstr "新密碼" msgid "Confirm New Password" msgstr "確認新密碼" +<<<<<<< HEAD #: UserList.php:163 +======= +#: UserList.php:166 +>>>>>>> master #, fuzzy msgid "Please confirm the password reset of this user" msgstr "請確認該用戶的密碼重置" @@ -3821,8 +4297,13 @@ msgstr "聯絡" msgid "City, State, Zip" msgstr "市，州，郵政編碼" +<<<<<<< HEAD #: 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:40 FamilyEditor.php:787 +#: FamilyView.php:241 Reports/ConfirmReportEmail.php:144 +>>>>>>> master #: Reports/ConfirmReport.php:145 msgid "Send Newsletter" msgstr "發送通訊" diff --git a/src/mysql/upgrade.json b/src/mysql/upgrade.json index 285c312d87..ce099bf16a 100644 --- a/src/mysql/upgrade.json +++ b/src/mysql/upgrade.json @@ -126,7 +126,6 @@ "2.7.3", "2.7.4", "2.7.5", - "2.8.0" ], "scripts": [ "/mysql/upgrade/2.8.0.sql" @@ -137,10 +136,14 @@ "versions": [ "2.8.0", "2.8.1", - "2.8.2" + "2.8.2", + "2.8.2", + "2.8.3", + "2.8.4", + "2.8.5" ], "scripts": [ ], "dbVersion": "2.9.0" } -} +} \ No newline at end of file diff --git a/src/mysql/upgrade/rebuild_nav_menus.sql b/src/mysql/upgrade/rebuild_nav_menus.sql index 51f368c44f..b865f55e9f 100644 --- a/src/mysql/upgrade/rebuild_nav_menus.sql +++ b/src/mysql/upgrade/rebuild_nav_menus.sql @@ -46,7 +46,8 @@ INSERT INTO `menuconfig_mcf` (`mid`, `name`, `parent`, `ismenu`, `content_englis (12, 'newperson', 'people', 0, 'Add New Person', 'Add New Person', 'PersonEditor.php', '', 'bAddRecords', NULL, 0, 0, NULL, 1, 2, NULL), (13, 'viewperson', 'people', 0, 'View All Persons', 'View All Persons', 'SelectList.php?mode=person', '', 'bAll', NULL, 0, 0, NULL, 1, 3, NULL), (14, 'newfamily', 'people', 0, 'Add New Family', 'Add New Family', 'FamilyEditor.php', '', 'bAddRecords', NULL, 0, 0, NULL, 1, 4, NULL), - (15, 'viewfamily', 'people', 0, 'View All Families', 'View All Families', 'FamilyList.php', '', 'bAll', NULL, 0, 0, NULL, 1, 5, NULL), + (15, 'viewfamily', 'people', 0, 'View Active Families', 'View Active Families', 'FamilyList.php', '', 'bAll', NULL, 0, 0, NULL, 1, 5, NULL), + (16, 'viewfamilyinactive', 'people', 0, 'View Inactive Families', 'View Inactive Families', 'FamilyList.php?mode=inactive', '', 'bAll', NULL, 0, 0, NULL, 1, 6, NULL), (20, 'groups', 'root', 1, 'Groups', 'Groups', '', '', 'bAll', NULL, 0, 0, NULL, 1, 3, 'fa-tag'), (21, 'listgroups', 'groups', 0, 'List Groups', 'List Groups', 'GroupList.php', '', 'bAll', NULL, 0, 0, NULL, 1, 1, NULL), diff --git a/src/skin/js/CRMJSOM.js b/src/skin/js/CRMJSOM.js index 0ad4f4e69c..34a846d4a1 100644 --- a/src/skin/js/CRMJSOM.js +++ b/src/skin/js/CRMJSOM.js @@ -15,20 +15,20 @@ window.CRM.DisplayErrorMessage = function(endpoint, error) { - message = "

    Error making API Call to: " + endpoint + - "

    Error text: " + error.message; + message = "

    " + i18next.t("Error making API Call to") + ": " + endpoint + + "

    " + i18next.t("Error text") + ": " + error.message; if (error.trace) { - message += "

    Stack Trace: 
    "+JSON.stringify(error.trace, undefined, 2)+"
    "; + message += "

    " + i18next.t("Stack Trace") + ": 
    "+JSON.stringify(error.trace, undefined, 2)+"
    "; } bootbox.alert({ - title: "ERROR", + title: i18next.t("ERROR"), message: message }); }; window.CRM.VerifyThenLoadAPIContent = function(url) { - var error = "There was a problem retrieving the requested object"; + var error = i18next.t("There was a problem retrieving the requested object"); $.ajax({ type: 'HEAD', url: url, @@ -153,42 +153,42 @@ \ \ - \ + \ ' } else { cartDropdownMenu = '\ -
  • Your Cart is Empty
    • '; +
  • ' + i18next.t("Your Cart is Empty" ) + '
    • '; } $("#cart-dropdown-menu").html(cartDropdownMenu); $("#CartBlock") @@ -295,7 +295,7 @@ title: 'Select Group and Role', message: '
    \ \ - Please select target group for members:\ + ' + i18next.t("Please select target group for members") + ':\ \ \
    ', diff --git a/src/skin/js/DepositSlipEditor.js b/src/skin/js/DepositSlipEditor.js index e7726830a1..aa53741059 100644 --- a/src/skin/js/DepositSlipEditor.js +++ b/src/skin/js/DepositSlipEditor.js @@ -3,7 +3,7 @@ function initPaymentTable() var colDef = [ { width: 'auto', - title:'Family', + title:i18next.t('Family'), data:'FamilyString', render: function(data, type, full, meta) { var familyName = data ? data : i18next.t('Anonymous'); @@ -13,17 +13,17 @@ function initPaymentTable() }, { width: 'auto', - title:'Check Number', + title:i18next.t('Check Number'), data:'Checkno' }, { width: 'auto', - title:'Amount', + title:i18next.t('Amount'), data:'sumAmount' }, { width: 'auto', - title:'Method', + title:i18next.t('Method'), data:'Method' } ]; @@ -33,7 +33,7 @@ function initPaymentTable() colDef.push( { width: 'auto', - title:'Details', + title:i18next.t('Details'), data:'Id', render: function(data, type, full, meta) { @@ -49,6 +49,9 @@ function initPaymentTable() url :window.CRM.root+"/api/deposits/"+depositSlipID+"/pledges", dataSrc:'' }, + "language": { + "url": window.CRM.plugin.dataTable.language.url + }, columns: colDef, responsive: true, "createdRow" : function (row,data,index) { diff --git a/src/skin/js/FamilyView.js b/src/skin/js/FamilyView.js index b298495f9f..b343b7bd42 100644 --- a/src/skin/js/FamilyView.js +++ b/src/skin/js/FamilyView.js @@ -1,11 +1,6 @@ $(document).ready(function () { - var options = { - "language": { - "url": window.CRM.root + "/skin/locale/datatables/" + window.CRM.locale + ".json" - } - }; - $("#pledge-payment-table").DataTable(options); + $("#pledge-payment-table").DataTable(window.CRM.plugin.dataTable); $("#onlineVerify").click(function () { @@ -16,9 +11,9 @@ $(document).ready(function () { .done(function(data, textStatus, xhr) { $('#confirm-verify').modal('hide'); if (xhr.status == 200) { - showGlobalMessage("Verification email sent", "success") + showGlobalMessage(i18next.t("Verification email sent"), "success") } else { - showGlobalMessage("Failed to send verification email ", "danger") + showGlobalMessage(i18next.t("Failed to send verification email"), "danger") } }); }); @@ -33,7 +28,7 @@ $(document).ready(function () { if (xhr.status == 200) { location.reload(); } else { - showGlobalMessage("Failed to add verification", "danger") + showGlobalMessage(i18next.t("Failed to add verification"), "danger") } }); }); diff --git a/src/skin/js/FindDepositSlip.js b/src/skin/js/FindDepositSlip.js index 55bc2d88cb..cae48a9d63 100644 --- a/src/skin/js/FindDepositSlip.js +++ b/src/skin/js/FindDepositSlip.js @@ -23,7 +23,7 @@ $(document).ready(function () { dataT = $("#depositsTable").DataTable({ "language": { - "url": window.CRM.root + "/skin/locale/datatables/" + window.CRM.locale + ".json" + "url": window.CRM.plugin.dataTable.language.url }, ajax: { url: window.CRM.root + "/api/deposits", @@ -33,7 +33,7 @@ $(document).ready(function () { "deferRender": true, columns: [ { - title: 'Deposit ID', + title:i18next.t( 'Deposit ID'), data: 'Id', render: function (data, type, full, meta) { if (type === 'display') { @@ -46,7 +46,7 @@ $(document).ready(function () { type: 'num' }, { - title: 'Deposit Date', + title:i18next.t( 'Deposit Date'), data: 'Date', render: function (data, type, full, meta) { if (type === 'display') { @@ -59,17 +59,17 @@ $(document).ready(function () { searchable: true }, { - title: 'Deposit Total', + title:i18next.t( 'Deposit Total'), data: 'totalAmount', searchable: false, }, { - title: 'Deposit Comment', + title:i18next.t( 'Deposit Comment'), data: 'Comment', searchable: true }, { - title: 'Closed', + title:i18next.t( 'Closed'), data: 'Closed', searchable: true, render: function (data, type, full, meta) { @@ -77,7 +77,7 @@ $(document).ready(function () { } }, { - title: 'Deposit Type', + title:i18next.t( 'Deposit Type'), data: 'Type', searchable: true } diff --git a/src/skin/js/Footer.js b/src/skin/js/Footer.js index 31fe204a09..1e4ed4316d 100644 --- a/src/skin/js/Footer.js +++ b/src/skin/js/Footer.js @@ -1,15 +1,21 @@ -$("document").ready(function(){ - - i18next - .use(i18nextXHRBackend) - .init( - { - backend: { - loadPath: window.CRM.root + '/locale/'+window.CRM.locale+'/LC_Messages/messages.js' - } - }); +i18nextOpt = { + lng:window.CRM.shortLocale, + nsSeparator: false, + keySeparator: false, + pluralSeparator:false, + contextSeparator:false, + fallbackLng: false, + resources: { } +}; +i18nextOpt.resources[window.CRM.shortLocale] = { + translation: window.CRM.i18keys +}; +i18next.init(i18nextOpt); + +$("document").ready(function(){ $(".multiSearch").select2({ + language: window.CRM.shortLocale, minimumInputLength: 2, ajax: { url: function (params){ diff --git a/src/skin/js/GroupEditor.js b/src/skin/js/GroupEditor.js index f0247e2ecf..747bd45413 100644 --- a/src/skin/js/GroupEditor.js +++ b/src/skin/js/GroupEditor.js @@ -7,17 +7,17 @@ $("document").ready(function() if(groupPropertyAction == "enableGroupProps") { $("#groupSpecificPropertiesModal").modal("show"); - $("#gsproperties-label").text("Confirm Enable Group Specific Properties"); - $("#groupSpecificPropertiesModal .modal-body span").text("This will create a group-specific properties table for this group. You should then add needed properties with the Group-Specific Properties Form Editor."); - $("#setgroupSpecificProperties").text("Enable Group Specific Properties"); + $("#gsproperties-label").text(i18next.t('Confirm Enable Group Specific Properties')); + $("#groupSpecificPropertiesModal .modal-body span").text(i18next.t('This will create a group-specific properties table for this group. You should then add needed properties with the Group-Specific Properties Form Editor.')); + $("#setgroupSpecificProperties").text(i18next.t('Enable Group Specific Properties')); $("#setgroupSpecificProperties").data("action",1); } else { $("#groupSpecificPropertiesModal").modal("show"); - $("#gsproperties-label").text("Confirm Disable Group Specific Properties"); - $("#groupSpecificPropertiesModal .modal-body span").text("Are you sure you want to remove the group-specific person properties? All group member properties data will be lost!"); - $("#setgroupSpecificProperties").text("Disable Group Specific Properties"); + $("#gsproperties-label").text(i18next.t('Confirm Disable Group Specific Properties')); + $("#groupSpecificPropertiesModal .modal-body span").text(i18next.t('Are you sure you want to remove the group-specific person properties? All group member properties data will be lost!')); + $("#setgroupSpecificProperties").text(i18next.t('Disable Group Specific Properties')); $("#setgroupSpecificProperties").data("action",0); } }); @@ -200,11 +200,14 @@ $("document").ready(function() }); dataT = $("#groupRoleTable").DataTable({ + "language": { + "url": window.CRM.plugin.dataTable.language.url + }, data: groupRoleData, columns: [ { width: 'auto', - title: 'Role Name', + title: i18next.t("Role Name"), data: 'lst_OptionName', render: function(data, type, full, meta) { @@ -216,7 +219,7 @@ $("document").ready(function() }, { width: 'auto', - title: 'Make Default', + title: i18next.t("Make Default"), render: function(data, type, full, meta) { if(full.lst_OptionID == defaultRoleID) @@ -231,7 +234,7 @@ $("document").ready(function() }, { width: '200px', - title: 'Sequence', + title: i18next.t("Sequence"), data: 'lst_OptionSequence', className: "dt-body-center", render: function(data, type, full, meta) @@ -258,10 +261,10 @@ $("document").ready(function() }, { width: 'auto', - title: 'Delete', + title: i18next.t("Delete"), render: function(data, type, full, meta) { - return ''; + return ''; } }, diff --git a/src/skin/js/GroupList.js b/src/skin/js/GroupList.js index 9ee6baaf40..9f3cb7a7b0 100644 --- a/src/skin/js/GroupList.js +++ b/src/skin/js/GroupList.js @@ -32,7 +32,7 @@ $(document).ready(function () { dataT = $("#groupsTable").DataTable({ "language": { - "url": window.CRM.root + "/skin/locale/datatables/" + window.CRM.locale + ".json" + "url": window.CRM.plugin.dataTable.language.url }, responsive: true, ajax: { @@ -42,7 +42,7 @@ $(document).ready(function () { columns: [ { width: 'auto', - title: 'Group Name', + title:i18next.t( 'Group Name'), data: 'Name', render: function (data, type, full, meta) { return '' + data; @@ -50,23 +50,23 @@ $(document).ready(function () { }, { width: 'auto', - title: 'Members', + title:i18next.t( 'Members'), data: 'memberCount', searchable: false, defaultContent: "0" }, { width: 'auto', - title: 'Group Cart Status', + title:i18next.t( 'Group Cart Status'), searchable: false, render: function (data, type, full, meta) { - return 'Checking Cart Status'; + return ''+i18next.t("Checking Cart Status")+''; } }, { width: 'auto', - title: 'Group Type', + title:i18next.t( 'Group Type'), data: 'groupType', defaultContent: "", searchable: true @@ -76,10 +76,10 @@ $(document).ready(function () { $(".cartStatusButton").each(function (index, element) { var objectID = $(element).data("groupid"); if ($.inArray(objectID, window.CRM.groupsInCart) > -1) { - $(element).html("All members of this group are in the cartRemove all"); + $(element).html(i18next.t("All members of this group are in the cart")+"" + i18next.t("Remove all") + ""); } else { - $(element).html("Not all members of this group are in the cart
    Add all"); + $(element).html(i18next.t("Not all members of this group are in the cart")+"
    " + i18next.t("Add all") + ""); } }); }); diff --git a/src/skin/js/GroupView.js b/src/skin/js/GroupView.js index 6b78e418d4..90808967b6 100644 --- a/src/skin/js/GroupView.js +++ b/src/skin/js/GroupView.js @@ -86,14 +86,14 @@ $(document).ready(function () { $("#deleteSelectedRows").click(function () { var deletedRows = dataT.rows('.selected').data() bootbox.confirm({ - message: "Are you sure you want to remove the " + deletedRows.length + " selected group members?", + message: i18next.t("Are you sure you want to remove the selected group members?") + " (" + deletedRows.length + ") ", buttons: { confirm: { - label: 'Yes', + label: i18next.t('Yes'), className: 'btn-success' }, cancel: { - label: 'No', + label: i18next.t('No'), className: 'btn-danger' } }, @@ -237,11 +237,11 @@ $(document).ready(function () { function initDataTable() { dataT = $("#membersTable").DataTable({ "language": { - "url": window.CRM.root + "/skin/locale/datatables/" + window.CRM.locale + ".json" + "url": window.CRM.plugin.dataTable.language.url }, "dom": 'T<"clear">lfrtip', "tableTools": { - "sSwfPath": "//cdn.datatables.net/tabletools/2.2.3/swf/copy_csv_xls_pdf.swf", + "sSwfPath": window.CRM.plugin.dataTable.tableTools.sSwfPath, "aButtons": [ { "sExtends": "csv", @@ -254,17 +254,25 @@ function initDataTable() { dataSrc: "Person2group2roleP2g2rs" }, columns: [ + { + width: 'auto', + title: '', + data: 'PersonId', + render: function (data, type, full, meta) { + return '   '; + } + }, { width: 'auto', - title: 'Name', + title:i18next.t( 'Name'), data: 'PersonId', render: function (data, type, full, meta) { - return '   ' + full.Person.FirstName + " " + full.Person.LastName + ''; + return full.Person.FirstName + " " + full.Person.LastName; } }, { width: 'auto', - title: 'Group Role', + title:i18next.t( 'Group Role'), data: 'RoleId', render: function (data, type, full, meta) { thisRole = $(window.CRM.groupRoles).filter(function (index, item) { @@ -275,34 +283,34 @@ function initDataTable() { }, { width: 'auto', - title: 'Address', + title:i18next.t( 'Address'), render: function (data, type, full, meta) { return full.Person.Address1 + " " + full.Person.Address2; } }, { width: 'auto', - title: 'City', + title:i18next.t( 'City'), data: 'Person.City' }, { width: 'auto', - title: 'State', + title:i18next.t( 'State'), data: 'Person.State' }, { width: 'auto', - title: 'ZIP', + title:i18next.t( 'ZIP'), data: 'Person.Zip' }, { width: 'auto', - title: 'Cell Phone', + title:i18next.t( 'Cell Phone'), data: 'Person.CellPhone' }, { width: 'auto', - title: 'E-mail', + title:i18next.t( 'E-mail'), data: 'Person.Email' } ], diff --git a/src/skin/js/IssueReporter.js b/src/skin/js/IssueReporter.js index 61260577ff..125943d208 100644 --- a/src/skin/js/IssueReporter.js +++ b/src/skin/js/IssueReporter.js @@ -25,11 +25,11 @@ $("#submitIssue").click(function () { }).done(function (data) { console.log(data); $("#IssueReportModal .modal-body").empty(); - $("

    ").text("Successfully submitted Issue #" + data.number).appendTo("#IssueReportModal .modal-body"); + $("

    ").text( i18next.t("Successfully submitted Issue")+" #" + data.number).appendTo("#IssueReportModal .modal-body"); $("", { href: data.url, target: "_blank", - text: "View Issue #" + data.number + " on GitHub" + text: i18next.t("View Issue on GitHub") + ": #" + data.number }).appendTo("#IssueReportModal .modal-body"); $("#submitIssue").remove(); $("