diff options
| author | Greg Roach <fisharebest@webtrees.net> | 2019-09-22 16:26:40 +0100 |
|---|---|---|
| committer | Greg Roach <fisharebest@webtrees.net> | 2019-09-22 16:37:55 +0100 |
| commit | a00bcc6367b57a659a7d6d69e7e1d00f79db8d9f (patch) | |
| tree | 82cd665bfa0164fa7d14f7656dd6355dd38b7d41 /resources/lang/th | |
| parent | 502cab9067673ad571ede842ac467603d7f0fe88 (diff) | |
| download | webtrees-a00bcc6367b57a659a7d6d69e7e1d00f79db8d9f.tar.gz webtrees-a00bcc6367b57a659a7d6d69e7e1d00f79db8d9f.tar.bz2 webtrees-a00bcc6367b57a659a7d6d69e7e1d00f79db8d9f.zip | |
Update password reset procedure
Diffstat (limited to 'resources/lang/th')
| -rw-r--r-- | resources/lang/th/messages.po | 1217 |
1 files changed, 623 insertions, 594 deletions
diff --git a/resources/lang/th/messages.po b/resources/lang/th/messages.po index a50f840341..617862c1fb 100644 --- a/resources/lang/th/messages.po +++ b/resources/lang/th/messages.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: webtrees\n" "Report-Msgid-Bugs-To: i18n@webtrees.net\n" -"POT-Creation-Date: 2019-08-26 09:28+0100\n" +"POT-Creation-Date: 2019-09-22 16:28+0100\n" "PO-Revision-Date: 2016-10-03 09:55+0000\n" "Last-Translator: Meliza Amity <meliza@amitys.com>\n" "Language-Team: Thai <https://translate.webtrees.net/projects/webtrees/webtrees/th/>\n" @@ -40,8 +40,8 @@ msgid " in " msgstr "" #. I18N: Abbreviation for "number %s" -#: app/Functions/FunctionsPrintFacts.php:188 -#: app/Functions/FunctionsPrintFacts.php:195 +#: app/Functions/FunctionsPrintFacts.php:189 +#: app/Functions/FunctionsPrintFacts.php:196 #, php-format msgid "#%s" msgstr "" @@ -64,7 +64,7 @@ msgid "%1$s %2$s times removed descending" msgstr "" #: app/Functions/FunctionsPrintLists.php:68 -#: app/Http/Controllers/IndividualController.php:261 +#: app/Http/Controllers/IndividualController.php:264 #, php-format msgid "%1$s (%2$s)" msgstr "" @@ -74,14 +74,14 @@ msgstr "" msgid "%1$s KB were downloaded in %2$s seconds." msgstr "" -#: app/Http/Controllers/Admin/UsersController.php:386 +#: app/Http/Controllers/Admin/UsersController.php:394 #: app/Http/Controllers/HomePageController.php:621 #, php-format msgid "%1$s does not exist" msgstr "" #. I18N: placeholders are GEDCOM XREFs, such as R123 -#: app/Http/Controllers/Admin/UsersController.php:295 +#: app/Http/Controllers/Admin/UsersController.php:303 #: app/Http/Controllers/AdminTreesController.php:261 #, php-format msgid "%1$s does not exist." @@ -608,18 +608,17 @@ msgctxt "CENTURY" msgid "9th" msgstr "" -#: app/Http/Controllers/AccountController.php:182 -#: app/Http/Controllers/Admin/UsersController.php:505 -#: app/Http/Controllers/AdminTreesController.php:2181 +#: app/Http/Controllers/Admin/UsersController.php:513 +#: app/Http/Controllers/AdminTreesController.php:2174 msgid "<default theme>" msgstr "" -#: resources/views/register-page.phtml:10 +#: resources/views/register-page.phtml:22 msgid "<div class=\"largeError\">Notice:</div><div class=\"error\">By completing and submitting this form, you agree:<ul><li>to protect the privacy of living individuals listed on our site;</li><li>and in the text box below, to explain to whom you are related, or to provide us with information on someone who should be listed on our website.</li></ul></div>" msgstr "" #. I18N: a label/value pair, such as “Occupation: Farmer”. Some languages may need to change the punctuation. -#: app/Fact.php:583 app/Functions/FunctionsPrintFacts.php:541 +#: app/Fact.php:583 app/Functions/FunctionsPrintFacts.php:542 #: app/GedcomTag.php:2130 #, php-format msgid "<span class=\"label\">%1$s:</span> <span class=\"field\" dir=\"auto\">%2$s</span>" @@ -720,7 +719,7 @@ msgid "A list of branches of a family." msgstr "" #. I18N: Description of the “Pending changes” module -#: app/Module/ReviewChangesModule.php:74 +#: app/Module/ReviewChangesModule.php:82 msgid "A list of changes that need to be reviewed by a moderator, and email notifications." msgstr "" @@ -808,16 +807,6 @@ msgstr "" msgid "A media object is a record in the family tree which contains information about a media file. This information may include a title, a copyright notice, a transcript, privacy restrictions, etc. The media file, such as the photo or video, can be stored locally (on this webserver) or remotely (on a different webserver)." msgstr "" -#: app/Http/Controllers/Auth/ForgotPasswordController.php:88 -#, php-format -msgid "A new password has been created and emailed to %s. You can change this password after you sign in." -msgstr "" - -#: resources/views/emails/password-reset-html.phtml:8 -#: resources/views/emails/password-reset-text.phtml:4 -msgid "A new password has been requested for your username." -msgstr "" - #. I18N: %1$s is a real-name, %2$s is a username, %3$s is an email address #: resources/views/emails/verify-notify-html.phtml:10 #: resources/views/emails/verify-notify-text.phtml:5 @@ -831,6 +820,11 @@ msgstr "" msgid "A new version of webtrees is available." msgstr "" +#: app/Http/RequestHandlers/PasswordRequestAction.php:93 +#, php-format +msgid "A password reset link has been sent to “%s”." +msgstr "" + #. I18N: Description of the “Journal” module #: app/Module/UserJournalModule.php:60 msgid "A private area to record notes or keep a journal." @@ -1068,9 +1062,9 @@ msgid "Aban" msgstr "" #. I18N: A configuration setting -#: resources/views/admin/trees-preferences.phtml:604 -#: resources/views/admin/trees-preferences.phtml:606 -#: resources/views/admin/trees-preferences.phtml:610 +#: resources/views/admin/trees-preferences.phtml:584 +#: resources/views/admin/trees-preferences.phtml:586 +#: resources/views/admin/trees-preferences.phtml:590 msgid "Abbreviate place names" msgstr "" @@ -1247,14 +1241,14 @@ msgid "Add a journal entry" msgstr "" #: app/Http/Controllers/EditMediaController.php:79 -#: resources/views/media-page.phtml:166 +#: resources/views/media-page.phtml:183 #: resources/views/modals/add-media-file.phtml:6 msgid "Add a media file" msgstr "" #: resources/views/cards/add-media-object.phtml:7 #: resources/views/family-page.phtml:95 -#: resources/views/individual-page.phtml:78 +#: resources/views/individual-page.phtml:93 #: resources/views/source-page.phtml:81 msgid "Add a media object" msgstr "" @@ -1281,12 +1275,12 @@ msgid "Add a note" msgstr "" #: resources/views/cards/add-restriction.phtml:7 -#: resources/views/media-page.phtml:156 +#: resources/views/media-page.phtml:173 msgid "Add a restriction" msgstr "" #: resources/views/cards/add-shared-note.phtml:7 -#: resources/views/family-page.phtml:83 resources/views/media-page.phtml:146 +#: resources/views/family-page.phtml:83 resources/views/media-page.phtml:163 #: resources/views/modules/notes/tab.phtml:50 msgid "Add a shared note" msgstr "" @@ -1296,7 +1290,7 @@ msgid "Add a son or daughter" msgstr "" #: resources/views/cards/add-source-citation.phtml:9 -#: resources/views/family-page.phtml:107 resources/views/media-page.phtml:136 +#: resources/views/family-page.phtml:107 resources/views/media-page.phtml:153 #: resources/views/modules/sources_tab/tab.phtml:38 msgid "Add a source citation" msgstr "" @@ -1307,7 +1301,7 @@ msgstr "" msgid "Add a story" msgstr "" -#: app/Http/Controllers/Admin/UsersController.php:274 +#: app/Http/Controllers/Admin/UsersController.php:282 #: resources/views/admin/control-panel.phtml:251 msgid "Add a user" msgstr "" @@ -1404,7 +1398,7 @@ msgid "Add the GEDCOM media path to filenames" msgstr "" #. I18N: A configuration setting -#: resources/views/admin/trees-preferences.phtml:208 +#: resources/views/admin/trees-preferences.phtml:188 msgid "Add to TITLE header tag" msgstr "" @@ -1414,11 +1408,11 @@ msgid "Add to the clippings cart" msgstr "" #. I18N: A configuration setting -#: resources/views/admin/trees-preferences.phtml:129 +#: resources/views/admin/trees-preferences.phtml:130 msgid "Add unique identifiers" msgstr "" -#: resources/views/admin/trees.phtml:204 +#: resources/views/admin/trees.phtml:212 msgid "Add unlinked records" msgstr "" @@ -1609,15 +1603,15 @@ msgstr "" msgid "Adult christening" msgstr "" -#: resources/views/admin/trees-preferences.phtml:884 +#: resources/views/admin/trees-preferences.phtml:864 msgid "Advanced fact preferences" msgstr "" -#: resources/views/admin/trees-preferences.phtml:889 +#: resources/views/admin/trees-preferences.phtml:869 msgid "Advanced name facts" msgstr "" -#: resources/views/admin/trees-preferences.phtml:902 +#: resources/views/admin/trees-preferences.phtml:882 msgid "Advanced place name facts" msgstr "" @@ -1635,15 +1629,10 @@ msgstr "" msgid "Africa" msgstr "" -#: resources/views/admin/trees.phtml:351 +#: resources/views/admin/trees.phtml:360 msgid "After creating the family tree, you will be able to import data from a GEDCOM file." msgstr "" -#: resources/views/emails/password-reset-html.phtml:25 -#: resources/views/emails/password-reset-text.phtml:11 -msgid "After you have signed in, select the “My account” link under the “My pages” menu and fill in the password fields to change your password." -msgstr "" - #. I18N: gedcom tag AGE #: app/Functions/FunctionsPrint.php:276 app/Functions/FunctionsPrint.php:303 #: app/GedcomTag.php:475 app/Statistics/Google/ChartAge.php:132 @@ -1704,12 +1693,12 @@ msgid "Age interval" msgstr "" #. I18N: A configuration setting -#: resources/views/admin/trees-preferences.phtml:430 +#: resources/views/admin/trees-preferences.phtml:410 msgid "Age of parents next to child’s birthdate" msgstr "" -#: resources/views/lists/individuals-table.phtml:532 -#: resources/views/lists/individuals-table.phtml:574 +#: resources/views/lists/individuals-table.phtml:533 +#: resources/views/lists/individuals-table.phtml:575 msgid "Age related to death year" msgstr "" @@ -1753,7 +1742,7 @@ msgstr "" msgid "Alive" msgstr "" -#: app/Functions/FunctionsEdit.php:178 +#: app/Functions/FunctionsEdit.php:163 #: app/Http/Controllers/ListController.php:149 #: app/Http/Controllers/ListController.php:158 #: app/Http/Controllers/ListController.php:167 @@ -1783,15 +1772,15 @@ msgstr "" msgid "All facts and events" msgstr "" -#: resources/views/admin/trees-preferences.phtml:753 +#: resources/views/admin/trees-preferences.phtml:733 msgid "All family facts" msgstr "" -#: app/Http/Controllers/Auth/RegisterController.php:202 +#: app/Http/Controllers/Auth/RegisterController.php:210 msgid "All fields must be completed." msgstr "" -#: resources/views/admin/trees-preferences.phtml:699 +#: resources/views/admin/trees-preferences.phtml:679 msgid "All individual facts" msgstr "" @@ -1810,11 +1799,11 @@ msgstr "" msgid "All records" msgstr "" -#: resources/views/admin/trees-preferences.phtml:848 +#: resources/views/admin/trees-preferences.phtml:828 msgid "All repository facts" msgstr "" -#: resources/views/admin/trees-preferences.phtml:807 +#: resources/views/admin/trees-preferences.phtml:787 msgid "All source facts" msgstr "" @@ -1824,7 +1813,7 @@ msgid "Allow other modules to edit text using a “WYSIWYG” editor, instead of msgstr "" #. I18N: A configuration setting -#: resources/views/admin/trees-preferences.phtml:651 +#: resources/views/admin/trees-preferences.phtml:631 msgid "Allow users to see raw GEDCOM records" msgstr "" @@ -1889,11 +1878,11 @@ msgstr "" msgid "An alternative way to sign in and sign out." msgstr "" -#: app/Functions/FunctionsEdit.php:446 +#: app/Functions/FunctionsEdit.php:431 msgid "An associate is another individual who was involved with this fact or event, such as a witness or a priest." msgstr "" -#: app/Functions/FunctionsEdit.php:444 +#: app/Functions/FunctionsEdit.php:429 msgid "An associate is another individual who was involved with this individual, such as a friend or an employer." msgstr "" @@ -1912,7 +1901,7 @@ msgstr "" msgid "An unexpected database error occurred." msgstr "" -#: resources/views/admin/location-edit.phtml:135 +#: resources/views/admin/location-edit.phtml:136 #: resources/views/modules/pedigree-map/chart.phtml:57 #: resources/views/place-map.phtml:60 msgid "An unknown error occurred" @@ -2018,13 +2007,13 @@ msgid "Apply privacy settings" msgstr "" #. I18N: Label for checkbox -#: resources/views/admin/trees-preferences.phtml:989 +#: resources/views/admin/trees-preferences.phtml:969 #: resources/views/admin/trees-privacy.phtml:287 msgid "Apply these preferences to all family trees" msgstr "" #. I18N: Label for checkbox -#: resources/views/admin/trees-preferences.phtml:996 +#: resources/views/admin/trees-preferences.phtml:976 #: resources/views/admin/trees-privacy.phtml:294 msgid "Apply these preferences to new family trees" msgstr "" @@ -2069,9 +2058,9 @@ msgstr "เมษายน" msgid "Aqua Marine" msgstr "" -#: app/Http/Controllers/IndividualController.php:283 +#: app/Http/Controllers/IndividualController.php:286 #: resources/views/edit/icon-fact-delete.phtml:3 -#: resources/views/media-page.phtml:80 +#: resources/views/media-page.phtml:95 msgid "Are you sure you want to delete this fact?" msgstr "" @@ -2080,9 +2069,9 @@ msgid "Are you sure you want to delete this message? It cannot be retrieved late msgstr "" #: app/Http/Controllers/Admin/MediaController.php:349 -#: app/Http/Controllers/Admin/UsersController.php:225 -#: resources/views/admin/trees.phtml:87 resources/views/admin/trees.phtml:96 -#: resources/views/edit-account-page.phtml:168 +#: app/Http/Controllers/Admin/UsersController.php:233 +#: resources/views/admin/trees.phtml:92 resources/views/admin/trees.phtml:101 +#: resources/views/edit-account-page.phtml:153 #: resources/views/gedcom-record-page-menu.phtml:10 #: resources/views/individual-page-menu.phtml:34 #: resources/views/media-page-menu.phtml:31 @@ -2264,12 +2253,12 @@ msgid "Automatically accept changes made by this user" msgstr "" #. I18N: A configuration setting -#: resources/views/admin/trees-preferences.phtml:570 +#: resources/views/admin/trees-preferences.phtml:550 msgid "Automatically expand notes" msgstr "" #. I18N: A configuration setting -#: resources/views/admin/trees-preferences.phtml:586 +#: resources/views/admin/trees-preferences.phtml:566 msgid "Automatically expand sources" msgstr "" @@ -2339,8 +2328,8 @@ msgid "Average number of children per family" msgstr "" #. I18N: help text for family tree / GEDCOM file names -#: resources/views/admin/trees-preferences.phtml:54 -#: resources/views/admin/trees.phtml:340 +#: resources/views/admin/trees-preferences.phtml:55 +#: resources/views/admin/trees.phtml:348 msgid "Avoid spaces and punctuation. A family name might be a good choice." msgstr "" @@ -2760,7 +2749,7 @@ msgstr "" msgid "Birth of a brother" msgstr "" -#: app/GedcomTag.php:1276 resources/views/admin/trees-preferences.phtml:474 +#: app/GedcomTag.php:1276 resources/views/admin/trees-preferences.phtml:454 msgid "Birth of a child" msgstr "" @@ -2769,7 +2758,7 @@ msgid "Birth of a daughter" msgstr "" #: app/GedcomTag.php:1287 app/GedcomTag.php:1298 app/GedcomTag.php:1309 -#: resources/views/admin/trees-preferences.phtml:468 +#: resources/views/admin/trees-preferences.phtml:448 msgid "Birth of a grandchild" msgstr "" @@ -2813,7 +2802,7 @@ msgstr "" msgid "Birth of a half-sister" msgstr "" -#: app/GedcomTag.php:1331 resources/views/admin/trees-preferences.phtml:480 +#: app/GedcomTag.php:1331 resources/views/admin/trees-preferences.phtml:460 msgid "Birth of a sibling" msgstr "" @@ -3225,7 +3214,7 @@ msgid "Buyer" msgstr "" #. I18N: Help text for the "Port number" site configuration setting -#: resources/views/admin/site-mail.phtml:65 +#: resources/views/admin/site-mail.phtml:96 msgid "By default, SMTP works on port 25." msgstr "" @@ -3239,7 +3228,7 @@ msgstr "" msgid "CSS and JS" msgstr "" -#: resources/views/admin/trees.phtml:37 +#: resources/views/admin/trees.phtml:41 #: resources/views/lists/datatables-attributes.phtml:27 msgid "Calculating…" msgstr "" @@ -3251,9 +3240,9 @@ msgid "Calendar" msgstr "ปฏิทิน" #. I18N: A configuration setting -#: resources/views/admin/trees-preferences.phtml:95 -#: resources/views/admin/trees-preferences.phtml:97 -#: resources/views/admin/trees-preferences.phtml:100 +#: resources/views/admin/trees-preferences.phtml:96 +#: resources/views/admin/trees-preferences.phtml:98 +#: resources/views/admin/trees-preferences.phtml:101 msgid "Calendar conversion" msgstr "" @@ -3334,7 +3323,7 @@ msgid "Caution!" msgstr "" #: resources/views/admin/trees-renumber.phtml:32 -#: resources/views/admin/trees.phtml:385 +#: resources/views/admin/trees.phtml:395 msgid "Caution! This may take a long time. Be patient." msgstr "" @@ -3418,13 +3407,13 @@ msgstr "" msgid "Change family members" msgstr "" -#: app/Http/Controllers/Admin/UsersController.php:239 +#: app/Http/Controllers/Admin/UsersController.php:247 #: app/Http/Controllers/HomePageController.php:627 msgid "Change the blocks on this user’s “My page”" msgstr "" #: app/Http/Controllers/HomePageController.php:388 -#: resources/views/admin/trees.phtml:78 +#: resources/views/admin/trees.phtml:82 msgid "Change the “Home page” blocks" msgstr "" @@ -3460,7 +3449,7 @@ msgid_plural "Changes in the last %s days" msgstr[0] "" #: app/Http/Controllers/Admin/ChangesLogController.php:119 -#: resources/views/admin/trees.phtml:193 +#: resources/views/admin/trees.phtml:201 msgid "Changes log" msgstr "" @@ -3493,12 +3482,12 @@ msgstr "" #: resources/views/admin/control-panel.phtml:331 #: resources/views/admin/modules.phtml:79 #: resources/views/admin/modules.phtml:81 -#: resources/views/admin/trees-preferences.phtml:424 +#: resources/views/admin/trees-preferences.phtml:404 msgid "Charts" msgstr "แผนภาพ" #: app/Http/Controllers/AdminTreesController.php:296 -#: resources/views/admin/trees.phtml:163 +#: resources/views/admin/trees.phtml:171 msgid "Check for errors" msgstr "" @@ -3606,7 +3595,7 @@ msgstr "" msgid "Choose relatives" msgstr "" -#: app/Http/Controllers/AdminSiteController.php:491 +#: app/Http/Controllers/AdminSiteController.php:492 msgid "Choose user defined welcome text typed below" msgstr "" @@ -3740,7 +3729,7 @@ msgctxt "MALE" msgid "Civil registrar" msgstr "" -#: app/Http/Controllers/AdminSiteController.php:106 +#: app/Http/Controllers/AdminSiteController.php:109 #: resources/views/admin/control-panel.phtml:91 msgid "Clean up data folder" msgstr "" @@ -3812,7 +3801,7 @@ msgstr "" #: resources/views/emails/register-notify-html.phtml:19 #: resources/views/emails/register-notify-text.phtml:9 -#: resources/views/register-page.phtml:68 +#: resources/views/register-page.phtml:81 msgid "Comments" msgstr "" @@ -3876,11 +3865,11 @@ msgstr "" #. I18N: Name of a module #: app/Module/ContactsFooterModule.php:55 -#: resources/views/admin/trees-preferences.phtml:140 +#: resources/views/admin/trees-preferences.phtml:141 msgid "Contact information" msgstr "" -#: resources/views/edit-account-page.phtml:130 +#: resources/views/edit-account-page.phtml:115 msgid "Contact method" msgstr "" @@ -3919,7 +3908,7 @@ msgstr "" #: resources/views/admin/modules.phtml:19 #: resources/views/admin/server-information.phtml:3 #: resources/views/admin/site-logs.phtml:4 -#: resources/views/admin/site-mail.phtml:5 +#: resources/views/admin/site-mail.phtml:26 #: resources/views/admin/site-preferences.phtml:4 #: resources/views/admin/site-registration.phtml:4 #: resources/views/admin/trees-check.phtml:3 @@ -3928,11 +3917,11 @@ msgstr "" #: resources/views/admin/trees-import.phtml:4 #: resources/views/admin/trees-merge.phtml:3 #: resources/views/admin/trees-places.phtml:3 -#: resources/views/admin/trees-preferences.phtml:8 +#: resources/views/admin/trees-preferences.phtml:9 #: resources/views/admin/trees-privacy.phtml:11 #: resources/views/admin/trees-renumber.phtml:3 #: resources/views/admin/trees-unconnected.phtml:17 -#: resources/views/admin/trees.phtml:8 +#: resources/views/admin/trees.phtml:12 #: resources/views/admin/upgrade/steps.phtml:4 #: resources/views/admin/upgrade/wizard.phtml:3 #: resources/views/admin/users-cleanup.phtml:4 @@ -4038,7 +4027,7 @@ msgstr "" msgid "Create" msgstr "" -#: app/Functions/FunctionsEdit.php:468 +#: app/Functions/FunctionsEdit.php:453 msgid "Create a family" msgstr "" @@ -4046,22 +4035,22 @@ msgstr "" msgid "Create a family from existing individuals" msgstr "" -#: resources/views/admin/trees.phtml:310 +#: resources/views/admin/trees.phtml:318 msgid "Create a family tree" msgstr "" -#: app/Functions/FunctionsEdit.php:488 +#: app/Functions/FunctionsEdit.php:473 #: resources/views/modals/create-media-from-file.phtml:12 #: resources/views/modals/create-media-object.phtml:7 msgid "Create a media object" msgstr "" -#: app/Functions/FunctionsEdit.php:533 +#: app/Functions/FunctionsEdit.php:518 #: resources/views/modals/create-repository.phtml:7 msgid "Create a repository" msgstr "" -#: app/Functions/FunctionsEdit.php:479 +#: app/Functions/FunctionsEdit.php:464 #: resources/views/modals/create-note-object.phtml:7 msgid "Create a shared note" msgstr "" @@ -4070,12 +4059,12 @@ msgstr "" msgid "Create a shared note using the census assistant" msgstr "" -#: app/Functions/FunctionsEdit.php:550 +#: app/Functions/FunctionsEdit.php:535 #: resources/views/modals/create-source.phtml:7 msgid "Create a source" msgstr "" -#: app/Functions/FunctionsEdit.php:558 +#: app/Functions/FunctionsEdit.php:543 #: resources/views/modals/create-submitter.phtml:7 msgid "Create a submitter" msgstr "" @@ -4096,7 +4085,7 @@ msgstr "" msgid "Create your own chart" msgstr "" -#: resources/views/admin/trees.phtml:376 +#: resources/views/admin/trees.phtml:385 msgid "Create, update, and delete a family tree for every GEDCOM file in the data folder." msgstr "" @@ -4281,6 +4270,11 @@ msgstr "" msgid "Czech Republic" msgstr "" +#. I18N: https://en.wikipedia.org/wiki/DomainKeys_Identified_Mail +#: resources/views/admin/site-mail.phtml:181 +msgid "DKIM digital signature" +msgstr "" + #. I18N: gedcom tag _DNA (from FTM 2010) #: app/GedcomTag.php:1785 msgid "DNA markers" @@ -4513,7 +4507,7 @@ msgid "Date sent" msgstr "" #. I18N: Help text for the “Calendar conversion” configuration setting -#: resources/views/admin/trees-preferences.phtml:116 +#: resources/views/admin/trees-preferences.phtml:117 #, php-format msgid "Dates are only converted if they are valid for the calendar. For example, only dates between %1$s and %2$s will be converted to the French calendar and only dates after %3$s will be converted to the Gregorian calendar." msgstr "" @@ -4701,7 +4695,7 @@ msgstr "" msgid "Death of a brother" msgstr "" -#: app/GedcomTag.php:1665 resources/views/admin/trees-preferences.phtml:520 +#: app/GedcomTag.php:1665 resources/views/admin/trees-preferences.phtml:500 msgid "Death of a child" msgstr "" @@ -4714,12 +4708,12 @@ msgid "Death of a father" msgstr "" #: app/GedcomTag.php:1709 app/GedcomTag.php:1720 app/GedcomTag.php:1731 -#: resources/views/admin/trees-preferences.phtml:544 +#: resources/views/admin/trees-preferences.phtml:524 msgid "Death of a grand-parent" msgstr "" #: app/GedcomTag.php:1676 app/GedcomTag.php:1687 app/GedcomTag.php:1698 -#: resources/views/admin/trees-preferences.phtml:514 +#: resources/views/admin/trees-preferences.phtml:494 msgid "Death of a grandchild" msgstr "" @@ -4787,7 +4781,7 @@ msgstr "" msgid "Death of a mother" msgstr "" -#: app/GedcomTag.php:1753 resources/views/admin/trees-preferences.phtml:532 +#: app/GedcomTag.php:1753 resources/views/admin/trees-preferences.phtml:512 msgid "Death of a parent" msgstr "" @@ -4799,7 +4793,7 @@ msgstr "" msgid "Death of a paternal grandmother" msgstr "" -#: app/GedcomTag.php:1764 resources/views/admin/trees-preferences.phtml:526 +#: app/GedcomTag.php:1764 resources/views/admin/trees-preferences.phtml:506 msgid "Death of a sibling" msgstr "" @@ -4811,7 +4805,7 @@ msgstr "" msgid "Death of a son" msgstr "" -#: app/GedcomTag.php:1775 resources/views/admin/trees-preferences.phtml:538 +#: app/GedcomTag.php:1775 resources/views/admin/trees-preferences.phtml:518 msgid "Death of a spouse" msgstr "" @@ -4852,13 +4846,13 @@ msgstr "" #: resources/views/lists/families-table.phtml:470 #: resources/views/lists/families-table.phtml:486 -#: resources/views/lists/individuals-table.phtml:480 -#: resources/views/lists/individuals-table.phtml:497 +#: resources/views/lists/individuals-table.phtml:481 +#: resources/views/lists/individuals-table.phtml:498 msgid "Decade of birth" msgstr "" -#: resources/views/lists/individuals-table.phtml:506 -#: resources/views/lists/individuals-table.phtml:523 +#: resources/views/lists/individuals-table.phtml:507 +#: resources/views/lists/individuals-table.phtml:524 msgid "Decade of death" msgstr "" @@ -4898,20 +4892,20 @@ msgstr "" msgid "Default chart" msgstr "" -#: resources/views/admin/trees.phtml:106 +#: resources/views/admin/trees.phtml:113 msgid "Default family tree" msgstr "" #. I18N: A configuration setting #: app/Module/WelcomeBlockModule.php:104 -#: resources/views/admin/trees-preferences.phtml:81 +#: resources/views/admin/trees-preferences.phtml:82 #: resources/views/edit-account-page.phtml:56 msgid "Default individual" msgstr "" #. I18N: A configuration setting #: resources/views/admin/site-preferences.phtml:53 -#: resources/views/admin/trees-preferences.phtml:249 +#: resources/views/admin/trees-preferences.phtml:229 msgid "Default theme" msgstr "" @@ -4941,19 +4935,19 @@ msgid "DejaVu" msgstr "" #: app/Http/Controllers/Admin/MediaController.php:352 -#: app/Http/Controllers/Admin/UsersController.php:225 +#: app/Http/Controllers/Admin/UsersController.php:233 #: app/Module/UserMessagesModule.php:165 app/Module/UserMessagesModule.php:205 #: resources/views/admin/locations.phtml:18 #: resources/views/admin/trees-privacy.phtml:264 -#: resources/views/admin/trees.phtml:88 resources/views/admin/trees.phtml:97 +#: resources/views/admin/trees.phtml:93 resources/views/admin/trees.phtml:102 #: resources/views/edit-blocks-block.phtml:22 #: resources/views/edit/icon-fact-delete.phtml:3 #: resources/views/edit/icon-fact-delete.phtml:5 #: resources/views/family-page-menu.phtml:39 #: resources/views/gedcom-record-page-menu.phtml:11 #: resources/views/individual-page-menu.phtml:35 -#: resources/views/media-page-menu.phtml:32 resources/views/media-page.phtml:80 -#: resources/views/media-page.phtml:83 +#: resources/views/media-page-menu.phtml:32 resources/views/media-page.phtml:95 +#: resources/views/media-page.phtml:98 #: resources/views/modules/faq/config.phtml:43 #: resources/views/modules/gedcom_news/list.phtml:31 #: resources/views/modules/stories/config.phtml:35 @@ -4969,7 +4963,7 @@ msgstr "ลบ" msgid "Delete all existing geographic data before importing the file." msgstr "" -#: app/Http/Controllers/Admin/UsersController.php:108 +#: app/Http/Controllers/Admin/UsersController.php:116 #: resources/views/admin/control-panel.phtml:257 msgid "Delete inactive users" msgstr "" @@ -4986,11 +4980,11 @@ msgstr "" msgid "Delete the preferences for this module." msgstr "" -#: app/Http/Controllers/IndividualController.php:283 +#: app/Http/Controllers/IndividualController.php:286 msgid "Delete this name" msgstr "ลบชื่อนี้" -#: resources/views/edit-account-page.phtml:168 +#: resources/views/edit-account-page.phtml:153 msgid "Delete your account" msgstr "" @@ -5057,7 +5051,7 @@ msgid "Description" msgstr "" #. I18N: A configuration setting -#: resources/views/admin/trees-preferences.phtml:228 +#: resources/views/admin/trees-preferences.phtml:208 msgid "Description META tag" msgstr "" @@ -5070,7 +5064,7 @@ msgstr "" #: resources/views/admin/merge-records-step-2.phtml:75 #: resources/views/admin/merge-records-step-2.phtml:121 #: resources/views/gedcom-record-page.phtml:33 -#: resources/views/media-page.phtml:34 +#: resources/views/media-page.phtml:49 #: resources/views/modules/statistics-chart/custom.phtml:62 #: resources/views/note-page.phtml:33 resources/views/repository-page.phtml:37 #: resources/views/source-page.phtml:33 @@ -5178,7 +5172,7 @@ msgid "Differences" msgstr "" #. I18N: Help text for the “Calendar conversion” configuration setting -#: resources/views/admin/trees-preferences.phtml:113 +#: resources/views/admin/trees-preferences.phtml:114 msgid "Different calendar systems are used in different parts of the world, and many other calendar systems have been used in the past. Where possible, you should enter dates using the calendar in which the event was originally recorded. You can then specify a conversion, to show these dates in a more familiar calendar. If you regularly use two calendars, you can specify two conversions and dates will be converted to both the selected calendars." msgstr "" @@ -5250,6 +5244,10 @@ msgstr "" msgid "Document" msgstr "" +#: resources/views/admin/site-mail.phtml:186 +msgid "Domain name" +msgstr "" + #. I18N: Name of a country or state #: app/Statistics/Service/CountryService.php:159 msgid "Dominica" @@ -5274,7 +5272,7 @@ msgstr "" msgid "Download %s…" msgstr "" -#: resources/views/media-page.phtml:100 +#: resources/views/media-page.phtml:130 msgid "Download file" msgstr "" @@ -5292,17 +5290,17 @@ msgstr "" msgid "Duodi" msgstr "" -#: app/Http/Controllers/AccountController.php:135 -#: app/Http/Controllers/Admin/UsersController.php:329 -#: app/Http/Controllers/Admin/UsersController.php:443 -#: app/Http/Controllers/Auth/RegisterController.php:212 +#: app/Http/Controllers/AccountController.php:147 +#: app/Http/Controllers/Admin/UsersController.php:337 +#: app/Http/Controllers/Admin/UsersController.php:451 +#: app/Http/Controllers/Auth/RegisterController.php:220 msgid "Duplicate email address. A user with that email already exists." msgstr "" -#: app/Http/Controllers/AccountController.php:126 -#: app/Http/Controllers/Admin/UsersController.php:324 -#: app/Http/Controllers/Admin/UsersController.php:449 -#: app/Http/Controllers/Auth/RegisterController.php:207 +#: app/Http/Controllers/AccountController.php:138 +#: app/Http/Controllers/Admin/UsersController.php:332 +#: app/Http/Controllers/Admin/UsersController.php:457 +#: app/Http/Controllers/Auth/RegisterController.php:215 msgid "Duplicate username. A user with that username already exists. Please choose another username." msgstr "" @@ -5341,17 +5339,17 @@ msgstr "" msgid "Ecuador" msgstr "" -#: app/Functions/FunctionsPrintFacts.php:774 +#: app/Functions/FunctionsPrintFacts.php:775 #: app/Http/Controllers/Admin/LocationController.php:272 #: app/Http/Controllers/Admin/LocationController.php:273 -#: app/Http/Controllers/Admin/UsersController.php:239 +#: app/Http/Controllers/Admin/UsersController.php:247 #: resources/views/admin/locations.phtml:17 #: resources/views/admin/locations.phtml:65 #: resources/views/admin/locations.phtml:68 #: resources/views/admin/users.phtml:13 #: resources/views/edit/icon-fact-edit.phtml:3 #: resources/views/edit/icon-fact-edit.phtml:5 -#: resources/views/media-page.phtml:72 resources/views/media-page.phtml:75 +#: resources/views/media-page.phtml:87 resources/views/media-page.phtml:90 #: resources/views/modules/faq/config.phtml:42 #: resources/views/modules/faq/config.phtml:87 #: resources/views/modules/gedcom_news/list.phtml:27 @@ -5368,7 +5366,7 @@ msgid "Edit a media file" msgstr "" #. I18N: Options for editing -#: resources/views/admin/trees-preferences.phtml:692 +#: resources/views/admin/trees-preferences.phtml:672 msgid "Edit preferences" msgstr "" @@ -5376,15 +5374,15 @@ msgstr "" msgid "Edit the FAQ" msgstr "" -#: app/Http/Controllers/IndividualController.php:332 +#: app/Http/Controllers/IndividualController.php:335 #: resources/views/individual-page-menu.phtml:12 #: resources/views/individual-page-menu.phtml:29 msgid "Edit the gender" msgstr "" -#: app/Functions/FunctionsEdit.php:602 +#: app/Functions/FunctionsEdit.php:587 #: app/Http/Controllers/EditIndividualController.php:597 -#: app/Http/Controllers/IndividualController.php:284 +#: app/Http/Controllers/IndividualController.php:287 msgid "Edit the name" msgstr "แก้ไขชื่อ" @@ -5411,7 +5409,7 @@ msgstr "" msgid "Edit the story" msgstr "" -#: app/Http/Controllers/Admin/UsersController.php:305 +#: app/Http/Controllers/Admin/UsersController.php:313 msgid "Edit the user" msgstr "" @@ -5425,7 +5423,7 @@ msgid "Editing restriction" msgstr "" #. I18N: Listbox entry; name of a role -#: app/Http/Controllers/Admin/UsersController.php:472 +#: app/Http/Controllers/Admin/UsersController.php:480 #: resources/views/admin/users-edit.phtml:239 msgid "Editor" msgstr "" @@ -5479,6 +5477,10 @@ msgctxt "NOMINATIVE" msgid "Elul" msgstr "" +#: resources/views/password-request-page.phtml:18 +msgid "Email" +msgstr "" + #. I18N: gedcom tag EMAIL #. I18N: gedcom tag _EMAIL #: app/GedcomTag.php:688 app/GedcomTag.php:1788 @@ -5489,16 +5491,11 @@ msgstr "" #: resources/views/edit-account-page.phtml:103 #: resources/views/emails/register-notify-html.phtml:17 #: resources/views/emails/register-notify-text.phtml:8 -#: resources/views/register-page.phtml:32 +#: resources/views/register-page.phtml:44 #: resources/views/setup/step-5-administrator.phtml:68 msgid "Email address" msgstr "" -#. I18N: Help text for the “webtrees reply address” configuration setting -#: resources/views/admin/trees-preferences.phtml:158 -msgid "Email address to be used in the “From:” field of emails that webtrees creates automatically.<br><br>webtrees can automatically create emails to notify administrators of changes that need to be reviewed. webtrees also sends notification emails to users who have requested an account.<br><br>Usually, the “From:” field of these automatically created emails is something like <i>From: webtrees-noreply@yoursite</i> to show that no response to the email is required. To guard against spam or other email abuse, some email systems require each message’s “From:” field to reflect a valid email account and will not accept messages that are apparently from account <i>webtrees-noreply</i>." -msgstr "" - #: resources/views/admin/users-edit.phtml:81 msgid "Email verified" msgstr "" @@ -5628,7 +5625,7 @@ msgid "Esfand" msgstr "" #. I18N: A configuration setting -#: resources/views/admin/trees-preferences.phtml:399 +#: resources/views/admin/trees-preferences.phtml:379 msgid "Estimated dates for birth and death" msgstr "" @@ -5701,11 +5698,11 @@ msgid "Excluded from this submission" msgstr "" #. I18N: placeholder text for registration-comments field -#: resources/views/register-page.phtml:71 +#: resources/views/register-page.phtml:85 msgid "Explain why you are requesting an account." msgstr "" -#: resources/views/admin/trees.phtml:279 +#: resources/views/admin/trees.phtml:287 msgid "Export" msgstr "" @@ -5818,7 +5815,7 @@ msgid "Fact 9" msgstr "" #. I18N: A configuration setting -#: resources/views/admin/trees-preferences.phtml:555 +#: resources/views/admin/trees-preferences.phtml:535 msgid "Fact icons" msgstr "" @@ -5837,27 +5834,27 @@ msgstr "ความเป็นจริงหรือเหตุการณ msgid "Facts and events" msgstr "ข้อเท็จจริงและเหตุการณ์ที่เกิดขึ้น" -#: resources/views/admin/trees-preferences.phtml:748 +#: resources/views/admin/trees-preferences.phtml:728 msgid "Facts for family records" msgstr "" -#: resources/views/admin/trees-preferences.phtml:694 +#: resources/views/admin/trees-preferences.phtml:674 msgid "Facts for individual records" msgstr "" -#: resources/views/admin/trees-preferences.phtml:779 +#: resources/views/admin/trees-preferences.phtml:759 msgid "Facts for new families" msgstr "" -#: resources/views/admin/trees-preferences.phtml:725 +#: resources/views/admin/trees-preferences.phtml:705 msgid "Facts for new individuals" msgstr "" -#: resources/views/admin/trees-preferences.phtml:843 +#: resources/views/admin/trees-preferences.phtml:823 msgid "Facts for repository records" msgstr "" -#: resources/views/admin/trees-preferences.phtml:802 +#: resources/views/admin/trees-preferences.phtml:782 msgid "Facts for source records" msgstr "" @@ -5868,7 +5865,7 @@ msgstr "" #. I18N: Name of a module/list #. I18N: Name of a module -#: app/Http/Controllers/AdminTreesController.php:2071 +#: app/Http/Controllers/AdminTreesController.php:2064 #: app/Http/Controllers/CalendarController.php:322 #: app/Http/Controllers/ListController.php:235 #: app/Module/AncestorsChartModule.php:224 @@ -5885,12 +5882,12 @@ msgstr "" #: resources/views/lists/media-table.phtml:70 #: resources/views/lists/notes-table.phtml:82 #: resources/views/lists/sources-table.phtml:85 -#: resources/views/media-page.phtml:45 +#: resources/views/media-page.phtml:60 #: resources/views/modules/gedcom_stats/config.phtml:22 #: resources/views/modules/gedcom_stats/statistics.phtml:63 #: resources/views/modules/html/template-statistics.phtml:30 #: resources/views/note-page.phtml:44 resources/views/place-events.phtml:12 -#: resources/views/place-sidebar.phtml:32 +#: resources/views/place-sidebar.phtml:27 #: resources/views/search-general-page.phtml:37 #: resources/views/search-results.phtml:20 resources/views/source-page.phtml:44 #: resources/xml/reports/fact_sources.xml:152 @@ -5970,7 +5967,7 @@ msgstr "" #: resources/views/admin/fix-level-0-media.phtml:23 #: resources/views/admin/site-logs.phtml:59 #: resources/views/admin/site-logs.phtml:97 -#: resources/views/admin/trees.phtml:50 +#: resources/views/admin/trees.phtml:54 #: resources/views/admin/users-edit.phtml:271 #: resources/views/modules/batch_update/admin.phtml:20 #: resources/views/modules/faq/config.phtml:19 @@ -5985,8 +5982,8 @@ msgstr "ต้นไม้ครอบครัว" msgid "Family tree clippings cart" msgstr "" -#: resources/views/admin/trees-preferences.phtml:23 -#: resources/views/admin/trees.phtml:320 +#: resources/views/admin/trees-preferences.phtml:24 +#: resources/views/admin/trees.phtml:328 msgid "Family tree title" msgstr "" @@ -6165,8 +6162,8 @@ msgctxt "NOMINATIVE" msgid "February" msgstr "กุมภาพันธ์" -#: app/Functions/FunctionsEdit.php:546 -#: app/Http/Controllers/IndividualController.php:317 +#: app/Functions/FunctionsEdit.php:531 +#: app/Http/Controllers/IndividualController.php:320 #: app/Module/StatisticsChartModule.php:776 msgid "Female" msgstr "" @@ -6248,7 +6245,7 @@ msgstr "" msgid "Find a special character" msgstr "" -#: app/Module/RelationshipsChartModule.php:629 +#: app/Module/RelationshipsChartModule.php:631 msgid "Find all possible relationships" msgstr "" @@ -6257,26 +6254,26 @@ msgid "Find any relationship" msgstr "" #: app/Http/Controllers/AdminTreesController.php:411 -#: resources/views/admin/trees.phtml:133 +#: resources/views/admin/trees.phtml:141 msgid "Find duplicates" msgstr "" -#: app/Module/RelationshipsChartModule.php:631 +#: app/Module/RelationshipsChartModule.php:633 msgid "Find other relationships" msgstr "" #: app/Module/RelationshipsChartModule.php:152 -#: resources/views/modules/relationships-chart/page.phtml:43 +#: resources/views/modules/relationships-chart/page.phtml:39 msgid "Find relationships via ancestors" msgstr "" -#: app/Module/RelationshipsChartModule.php:635 -#: resources/views/modules/relationships-chart/page.phtml:57 +#: app/Module/RelationshipsChartModule.php:637 +#: resources/views/modules/relationships-chart/page.phtml:53 msgid "Find the closest relationships" msgstr "" -#: app/Http/Controllers/AdminTreesController.php:1843 -#: resources/views/admin/trees.phtml:173 +#: app/Http/Controllers/AdminTreesController.php:1842 +#: resources/views/admin/trees.phtml:181 msgid "Find unrelated individuals" msgstr "" @@ -6302,7 +6299,7 @@ msgstr "" msgid "Fix name slashes and spaces" msgstr "" -#: resources/views/admin/location-edit.phtml:30 +#: resources/views/admin/location-edit.phtml:31 #: resources/views/admin/locations.phtml:16 msgid "Flag" msgstr "" @@ -6416,7 +6413,7 @@ msgstr "" msgid "For websites with more than one family tree, this option will show the list of family trees in the main menu, the search pages, etc." msgstr "" -#: resources/views/login-page.phtml:53 +#: resources/views/login-page.phtml:61 #: resources/views/modules/login_block/sign-in.phtml:28 msgid "Forgot password?" msgstr "" @@ -6429,7 +6426,7 @@ msgid "Format" msgstr "" #. I18N: A configuration setting -#: resources/views/admin/trees-preferences.phtml:631 +#: resources/views/admin/trees-preferences.phtml:611 msgid "Format text and notes" msgstr "" @@ -6604,14 +6601,14 @@ msgstr "" #. I18N: A configuration setting #: resources/views/admin/trees-check.phtml:9 -#: resources/views/admin/trees-preferences.phtml:666 +#: resources/views/admin/trees-preferences.phtml:646 msgid "GEDCOM errors" msgstr "" #. I18N: gedcom tag GEDC #. I18N: gedcom tag _GEDF #: app/GedcomTag.php:777 app/GedcomTag.php:1826 -#: resources/views/admin/trees.phtml:272 +#: resources/views/admin/trees.phtml:280 msgid "GEDCOM file" msgstr "" @@ -6626,7 +6623,7 @@ msgid "Gambia" msgstr "" #. I18N: gedcom tag SEX -#: app/GedcomTag.php:1001 app/Http/Controllers/IndividualController.php:341 +#: app/GedcomTag.php:1001 app/Http/Controllers/IndividualController.php:344 #: resources/xml/reports/family_group_report.xml:844 #: resources/xml/reports/individual_ext_report.xml:391 #: resources/xml/reports/individual_ext_report.xml:598 @@ -6640,17 +6637,17 @@ msgid "Genealogy" msgstr "" #. I18N: A configuration setting -#: resources/views/admin/trees-preferences.phtml:166 +#: resources/views/admin/trees-preferences.phtml:146 msgid "Genealogy contact" msgstr "" #. I18N: Individuals, sources, dates, places, etc. -#: resources/views/admin/trees.phtml:126 +#: resources/views/admin/trees.phtml:134 msgid "Genealogy data" msgstr "" -#: resources/views/admin/trees-preferences.phtml:18 -#: resources/views/admin/trees-preferences.phtml:645 +#: resources/views/admin/trees-preferences.phtml:19 +#: resources/views/admin/trees-preferences.phtml:625 msgid "General" msgstr "" @@ -7006,8 +7003,8 @@ msgstr "" #: resources/views/emails/message-copy-text.phtml:2 #: resources/views/emails/message-user-html.phtml:4 #: resources/views/emails/message-user-text.phtml:2 -#: resources/views/emails/password-reset-html.phtml:4 -#: resources/views/emails/password-reset-text.phtml:2 +#: resources/views/emails/password-request-html.phtml:5 +#: resources/views/emails/password-request-text.phtml:3 #: resources/views/emails/pending-changes-html.phtml:4 #: resources/views/emails/pending-changes-text.phtml:3 #: resources/views/emails/register-user-html.phtml:4 @@ -7091,7 +7088,7 @@ msgctxt "NOMINATIVE" msgid "Heshvan" msgstr "" -#: app/Functions/FunctionsEdit.php:93 app/Functions/FunctionsEdit.php:252 +#: app/Functions/FunctionsEdit.php:93 app/Functions/FunctionsEdit.php:237 #: app/Http/Controllers/AdminController.php:373 #: app/Http/Controllers/AdminTreesController.php:1029 #: resources/views/admin/trees-privacy.phtml:158 @@ -7129,7 +7126,7 @@ msgstr "" #. I18N: Name of a module #. I18N: A configuration setting #: app/Module/HitCountFooterModule.php:61 -#: resources/views/admin/trees-preferences.phtml:681 +#: resources/views/admin/trees-preferences.phtml:661 msgid "Hit counters" msgstr "" @@ -7236,7 +7233,7 @@ msgid "If a media object is linked to an individual, when it should be linked to msgstr "" #. I18N: Help text for the “Language” configuration setting -#: resources/views/admin/trees-preferences.phtml:73 +#: resources/views/admin/trees-preferences.phtml:74 msgid "If a visitor to the website has not selected a preferred language in their browser preferences, or they have selected an unsupported language, then this language will be used. Typically this applies to search engines." msgstr "" @@ -7279,7 +7276,7 @@ msgid "If this individual has any events other than death, burial, or cremation msgstr "" #. I18N: Help text for the “Media folder” configuration setting -#: resources/views/admin/trees-preferences.phtml:278 +#: resources/views/admin/trees-preferences.phtml:258 msgid "If two family trees use the same media folder, then they will be able to share media files. If they use different media folders, then their media files will be kept separate." msgstr "" @@ -7288,7 +7285,7 @@ msgid "If visitors can not see the family tree, they will not be able to sign up msgstr "" #. I18N: Help text for the “Who can upload new media files” configuration setting -#: resources/views/admin/trees-preferences.phtml:293 +#: resources/views/admin/trees-preferences.phtml:273 msgid "If you are concerned that users might upload inappropriate images, you can restrict media uploads to managers only." msgstr "" @@ -7308,6 +7305,11 @@ msgstr "" msgid "If you created this GEDCOM file using genealogy software that omits spaces when splitting long lines, then select this option to reinsert the missing spaces." msgstr "" +#: resources/views/emails/password-request-html.phtml:17 +#: resources/views/emails/password-request-text.phtml:9 +msgid "If you did not request a new password, please ignore this message." +msgstr "" + #: resources/views/emails/register-user-html.phtml:23 #: resources/views/emails/register-user-text.phtml:10 msgid "If you didn’t request an account, you can just delete this message." @@ -7326,7 +7328,7 @@ msgid "If you select a different folder, you must also move all files (except co msgstr "" #. I18N: Help text for the “Media folder” configuration setting -#: resources/views/admin/trees-preferences.phtml:277 +#: resources/views/admin/trees-preferences.phtml:257 msgid "If you select a different folder, you must also move any media files from the existing folder to the new one." msgstr "" @@ -7347,7 +7349,7 @@ msgstr "" msgid "Image dimensions" msgstr "" -#: resources/views/admin/trees-preferences.phtml:350 +#: resources/views/admin/trees-preferences.phtml:330 msgid "Images without watermarks" msgstr "" @@ -7356,7 +7358,7 @@ msgstr "" msgid "Immigration" msgstr "" -#: resources/views/admin/trees.phtml:289 +#: resources/views/admin/trees.phtml:297 msgid "Import" msgstr "" @@ -7399,7 +7401,7 @@ msgid "In many cultures it is customary to have a traditional name spelled in th msgstr "" #. I18N: Help text for the “Calendar conversion” configuration setting -#: resources/views/admin/trees-preferences.phtml:119 +#: resources/views/admin/trees-preferences.phtml:120 msgid "In some calendars, days start at midnight. In other calendars, days start at sunset. The conversion process does not take account of the time, so for any event that occurs between sunset and midnight, the conversion between these types of calendar will be one day out." msgstr "" @@ -7472,7 +7474,7 @@ msgstr "" #: app/GedcomTag.php:802 app/Module/IndividualReportModule.php:38 #: resources/views/admin/fix-level-0-media.phtml:26 #: resources/views/admin/trees-privacy.phtml:173 -#: resources/views/admin/trees.phtml:211 +#: resources/views/admin/trees.phtml:219 #: resources/views/cards/add-source-citation.phtml:23 #: resources/views/modals/link-media-to-individual.phtml:13 #: resources/views/modules/ancestors-chart/page.phtml:19 @@ -7510,7 +7512,7 @@ msgstr "" msgid "Individual 1" msgstr "" -#: resources/views/modules/relationships-chart/page.phtml:29 +#: resources/views/modules/relationships-chart/page.phtml:25 msgid "Individual 2" msgstr "" @@ -7522,7 +7524,7 @@ msgstr "" msgid "Individual page" msgstr "" -#: resources/views/admin/trees-preferences.phtml:456 +#: resources/views/admin/trees-preferences.phtml:436 msgid "Individual pages" msgstr "" @@ -7538,7 +7540,7 @@ msgid "Individual who lived the longest" msgstr "" #. I18N: Name of a module/list -#: app/Http/Controllers/AdminTreesController.php:2070 +#: app/Http/Controllers/AdminTreesController.php:2063 #: app/Http/Controllers/CalendarController.php:321 #: app/Http/Controllers/ListController.php:237 #: app/Module/AncestorsChartModule.php:223 @@ -7559,7 +7561,7 @@ msgstr "" #: resources/views/lists/notes-table.phtml:81 #: resources/views/lists/sources-table.phtml:84 #: resources/views/lists/surnames-table.phtml:22 -#: resources/views/media-page.phtml:39 +#: resources/views/media-page.phtml:54 #: resources/views/modules/census-assistant.phtml:51 #: resources/views/modules/gedcom_stats/config.phtml:20 #: resources/views/modules/gedcom_stats/statistics.phtml:19 @@ -7568,7 +7570,7 @@ msgstr "" #: resources/views/modules/statistics-chart/custom.phtml:53 #: resources/views/modules/statistics-chart/custom.phtml:148 #: resources/views/note-page.phtml:38 resources/views/place-events.phtml:6 -#: resources/views/place-sidebar.phtml:23 +#: resources/views/place-sidebar.phtml:19 #: resources/views/search-general-page.phtml:30 #: resources/views/search-results.phtml:9 resources/views/source-page.phtml:38 #: resources/xml/reports/fact_sources.xml:54 @@ -7918,7 +7920,7 @@ msgid "Keep open" msgstr "" #. I18N: A configuration setting -#: resources/views/admin/trees-preferences.phtml:963 +#: resources/views/admin/trees-preferences.phtml:943 #: resources/views/edit/add-fact.phtml:70 #: resources/views/edit/edit-fact.phtml:96 msgid "Keep the existing “last change” information" @@ -8062,7 +8064,7 @@ msgstr "" #: app/GedcomTag.php:808 app/Module/ModuleLanguageTrait.php:46 #: app/Module/ModuleThemeTrait.php:247 resources/views/admin/modules.phtml:249 #: resources/views/admin/modules.phtml:252 -#: resources/views/admin/trees-preferences.phtml:62 +#: resources/views/admin/trees-preferences.phtml:63 #: resources/views/admin/users-edit.phtml:106 #: resources/views/admin/users.phtml:18 #: resources/views/edit-account-page.phtml:82 @@ -8117,7 +8119,7 @@ msgstr "" msgid "Last change" msgstr "" -#: app/Module/ReviewChangesModule.php:142 +#: app/Module/ReviewChangesModule.php:150 msgid "Last email reminder was sent " msgstr "" @@ -8153,7 +8155,7 @@ msgstr "" #. I18N: gedcom tag LATI #: app/Functions/FunctionsPrint.php:350 app/GedcomTag.php:811 -#: resources/views/admin/location-edit.phtml:41 +#: resources/views/admin/location-edit.phtml:42 #: resources/views/admin/locations.phtml:13 #: resources/views/edit/input-addon-coordinates.phtml:5 #: resources/views/edit/input-addon-coordinates.phtml:8 @@ -8318,7 +8320,7 @@ msgstr "" #: resources/views/admin/control-panel.phtml:338 #: resources/views/admin/modules.phtml:83 #: resources/views/admin/modules.phtml:85 -#: resources/views/admin/trees-preferences.phtml:360 +#: resources/views/admin/trees-preferences.phtml:340 msgid "Lists" msgstr "รายการ" @@ -8384,7 +8386,7 @@ msgid "London, England" msgstr "" #. I18N: Help text for the “Maximum number of surnames on individual list” configuration setting -#: resources/views/admin/trees-preferences.phtml:390 +#: resources/views/admin/trees-preferences.phtml:370 msgid "Long lists of individuals with the same surname can be broken into smaller sub-lists according to the first letter of the individual’s given name.<br><br>This option determines when sub-listing of surnames will occur. To disable sub-listing completely, set this option to zero." msgstr "" @@ -8394,7 +8396,7 @@ msgstr "" #. I18N: gedcom tag LONG #: app/Functions/FunctionsPrint.php:356 app/GedcomTag.php:817 -#: resources/views/admin/location-edit.phtml:52 +#: resources/views/admin/location-edit.phtml:53 #: resources/views/admin/locations.phtml:14 #: resources/views/edit/input-addon-coordinates.phtml:5 #: resources/views/edit/input-addon-coordinates.phtml:8 @@ -8406,10 +8408,6 @@ msgstr "" msgid "Los Angeles, California, United States" msgstr "" -#: app/Http/Controllers/Auth/ForgotPasswordController.php:77 -msgid "Lost password request" -msgstr "" - #. I18N: Location of an LDS church temple #: app/GedcomCode/GedcomCodeTemp.php:433 msgid "Louisville, Kentucky, United States" @@ -8474,8 +8472,8 @@ msgstr "" msgid "Maldives" msgstr "" -#: app/Functions/FunctionsEdit.php:546 -#: app/Http/Controllers/IndividualController.php:314 +#: app/Functions/FunctionsEdit.php:531 +#: app/Http/Controllers/IndividualController.php:317 #: app/Module/StatisticsChartModule.php:775 msgid "Male" msgstr "" @@ -8521,7 +8519,7 @@ msgstr "" #: resources/views/admin/trees-duplicates.phtml:3 #: resources/views/admin/trees-export.phtml:3 #: resources/views/admin/trees-import.phtml:4 -#: resources/views/admin/trees-preferences.phtml:8 +#: resources/views/admin/trees-preferences.phtml:9 #: resources/views/admin/trees-privacy.phtml:11 msgid "Manage family trees" msgstr "" @@ -8544,7 +8542,7 @@ msgid "Manage the links" msgstr "" #. I18N: Listbox entry; name of a role -#: app/Http/Controllers/Admin/UsersController.php:476 +#: app/Http/Controllers/Admin/UsersController.php:484 #: resources/views/admin/trees-export.phtml:91 #: resources/views/admin/users-edit.phtml:253 #: resources/views/modules/clippings/download.phtml:21 @@ -8581,15 +8579,10 @@ msgid "Manuscript" msgstr "" #. I18N: Help text for the “GEDCOM errors” configuration setting -#: resources/views/admin/trees-preferences.phtml:671 +#: resources/views/admin/trees-preferences.phtml:651 msgid "Many genealogy programs create GEDCOM files with custom tags, and webtrees understands most of them. When unrecognized tags are found, this option lets you choose whether to ignore them or display a warning message." msgstr "" -#. I18N: Help text for the "Sending server name" site configuration setting -#: resources/views/admin/site-mail.phtml:132 -msgid "Many mail servers require that the sending server identifies itself correctly, using a valid domain name." -msgstr "" - #. I18N: Type of media object #: app/GedcomTag.php:2385 resources/views/admin/control-panel.phtml:517 #: resources/views/modules/statistics-chart/custom.phtml:50 @@ -8630,7 +8623,7 @@ msgid "March" msgstr "มีนาคม" #. I18N: Help text for the “Format text and notes” configuration setting -#: resources/views/admin/trees-preferences.phtml:639 +#: resources/views/admin/trees-preferences.phtml:619 msgid "Markdown is a simple system of formatting, used on websites such as Wikipedia. It uses unobtrusive punctuation characters to create headings and sub-headings, bold and italic text, lists, tables, etc." msgstr "" @@ -8744,7 +8737,7 @@ msgstr "" msgid "Marriage of a brother" msgstr "" -#: app/GedcomTag.php:1884 resources/views/admin/trees-preferences.phtml:494 +#: app/GedcomTag.php:1884 resources/views/admin/trees-preferences.phtml:474 msgid "Marriage of a child" msgstr "" @@ -8758,7 +8751,7 @@ msgid "Marriage of a father" msgstr "" #: app/GedcomTag.php:1899 app/GedcomTag.php:1910 app/GedcomTag.php:1921 -#: resources/views/admin/trees-preferences.phtml:488 +#: resources/views/admin/trees-preferences.phtml:468 msgid "Marriage of a grandchild" msgstr "" @@ -8808,11 +8801,11 @@ msgid "Marriage of a mother" msgstr "" #. I18N: ...to another spouse -#: app/GedcomTag.php:1946 resources/views/admin/trees-preferences.phtml:506 +#: app/GedcomTag.php:1946 resources/views/admin/trees-preferences.phtml:486 msgid "Marriage of a parent" msgstr "" -#: app/GedcomTag.php:1957 resources/views/admin/trees-preferences.phtml:500 +#: app/GedcomTag.php:1957 resources/views/admin/trees-preferences.phtml:480 msgid "Marriage of a sibling" msgstr "" @@ -8884,7 +8877,7 @@ msgstr "" msgid "Martinique" msgstr "" -#: app/Http/Controllers/Admin/UsersController.php:225 +#: app/Http/Controllers/Admin/UsersController.php:233 msgid "Masquerade as this user" msgstr "" @@ -8912,7 +8905,7 @@ msgid "Mauritius" msgstr "" #. I18N: A configuration setting -#: resources/views/admin/trees-preferences.phtml:377 +#: resources/views/admin/trees-preferences.phtml:357 msgid "Maximum number of surnames on individual list" msgstr "" @@ -8973,7 +8966,7 @@ msgstr "สื่อ" #: resources/views/admin/media.phtml:80 #: resources/views/admin/webtrees1-thumbnails.phtml:30 #: resources/views/media-list-page.phtml:138 -#: resources/views/media-page.phtml:69 resources/views/media-page.phtml:162 +#: resources/views/media-page.phtml:84 resources/views/media-page.phtml:179 #: resources/views/modals/create-media-from-file.phtml:20 #: resources/views/modals/media-file-fields.phtml:6 msgid "Media file" @@ -8990,17 +8983,17 @@ msgid "Media filenames will be prefixed by %s." msgstr "" #: resources/views/admin/media.phtml:13 -#: resources/views/admin/trees-preferences.phtml:283 +#: resources/views/admin/trees-preferences.phtml:263 msgid "Media files" msgstr "" #. I18N: A configuration setting -#: resources/views/admin/trees-preferences.phtml:264 +#: resources/views/admin/trees-preferences.phtml:244 msgid "Media folder" msgstr "" #: resources/views/admin/media.phtml:14 -#: resources/views/admin/trees-preferences.phtml:259 +#: resources/views/admin/trees-preferences.phtml:239 msgid "Media folders" msgstr "" @@ -9009,7 +9002,7 @@ msgstr "" #: resources/views/admin/fix-level-0-media.phtml:24 #: resources/views/admin/media.phtml:82 #: resources/views/admin/trees-privacy.phtml:178 -#: resources/views/admin/trees.phtml:242 +#: resources/views/admin/trees.phtml:250 #: resources/views/admin/webtrees1-thumbnails.phtml:31 #: resources/views/family-page.phtml:91 #: resources/views/modules/favorites/favorites.phtml:87 @@ -9018,7 +9011,7 @@ msgid "Media object" msgstr "" #. I18N: Name of a module/list -#: app/Http/Controllers/AdminTreesController.php:2072 +#: app/Http/Controllers/AdminTreesController.php:2065 #: app/Module/MediaListModule.php:46 #: resources/views/admin/fix-level-0-media.phtml:19 #: resources/views/admin/merge-records-step-1.phtml:22 @@ -9106,7 +9099,7 @@ msgid "Melbourne, Australia" msgstr "" #. I18N: Listbox entry; name of a role -#: app/Http/Controllers/Admin/UsersController.php:470 +#: app/Http/Controllers/Admin/UsersController.php:478 #: resources/views/admin/trees-export.phtml:97 #: resources/views/admin/users-edit.phtml:231 #: resources/views/modules/clippings/download.phtml:24 @@ -9146,7 +9139,7 @@ msgid "Merge family trees" msgstr "" #: app/Http/Controllers/AdminController.php:56 -#: resources/views/admin/trees.phtml:143 +#: resources/views/admin/trees.phtml:151 msgid "Merge records" msgstr "" @@ -9170,7 +9163,7 @@ msgstr "" #. I18N: Name of a module #. I18N: A configuration setting #: app/Module/UserMessagesModule.php:64 -#: resources/views/admin/site-mail.phtml:19 +#: resources/views/admin/site-mail.phtml:40 msgid "Messages" msgstr "" @@ -9245,7 +9238,7 @@ msgid "Missing data" msgstr "" #. I18N: Listbox entry; name of a role -#: app/Http/Controllers/Admin/UsersController.php:474 +#: app/Http/Controllers/Admin/UsersController.php:482 #: resources/views/admin/users-edit.phtml:245 msgid "Moderator" msgstr "" @@ -9411,7 +9404,7 @@ msgid "Morocco" msgstr "" #. I18N: Help text for the “Use password” site configuration setting -#: resources/views/admin/site-mail.phtml:79 +#: resources/views/admin/site-mail.phtml:111 msgid "Most SMTP servers require a password." msgstr "" @@ -9421,8 +9414,21 @@ msgstr "" msgid "Most common surnames" msgstr "" +#: resources/views/admin/site-mail.phtml:173 +msgid "Most mail servers require a valid domain name." +msgstr "" + +#: resources/views/admin/site-mail.phtml:65 +msgid "Most mail servers require a valid email address." +msgstr "" + +#. I18N: Help text for the "Sending server name" site configuration setting +#: resources/views/admin/site-mail.phtml:168 +msgid "Most mail servers require that the sending server identifies itself correctly, using a valid domain name." +msgstr "" + #. I18N: Help text for the “Secure connection” site configuration setting -#: resources/views/admin/site-mail.phtml:119 +#: resources/views/admin/site-mail.phtml:154 msgid "Most servers do not use secure connections." msgstr "" @@ -9536,7 +9542,7 @@ msgstr "" msgid "Multiple marriages" msgstr "" -#: app/Http/Controllers/AccountController.php:79 +#: app/Http/Controllers/AccountController.php:78 #: app/Module/ModuleThemeTrait.php:307 app/Module/UserWelcomeModule.php:110 msgid "My account" msgstr "" @@ -9573,7 +9579,7 @@ msgstr "" #. I18N: gedcom tag NAME #: app/GedcomTag.php:862 app/Http/Controllers/HelpTextController.php:200 -#: app/Http/Controllers/IndividualController.php:237 +#: app/Http/Controllers/IndividualController.php:240 #: app/Statistics/Google/ChartCommonGiven.php:77 #: app/Statistics/Google/ChartCommonSurname.php:136 #: resources/views/modals/submitter-fields.phtml:5 @@ -9684,7 +9690,7 @@ msgstr "" msgid "Netherlands" msgstr "" -#: app/Http/Controllers/Admin/UsersController.php:248 +#: app/Http/Controllers/Admin/UsersController.php:256 #: resources/views/components/datetime.phtml:11 msgid "Never" msgstr "" @@ -9726,14 +9732,14 @@ msgid "New data" msgstr "" #. I18N: %s is a server name/URL -#: app/Http/Controllers/Auth/RegisterController.php:153 +#: app/Http/Controllers/Auth/RegisterController.php:161 #, php-format msgid "New registration at %s" msgstr "" #. I18N: %s is a server name/URL -#: app/Http/Controllers/Admin/UsersController.php:400 -#: app/Http/Controllers/Auth/VerifyEmailController.php:65 +#: app/Http/Controllers/Admin/UsersController.php:408 +#: app/Http/Controllers/Auth/VerifyEmailController.php:77 #, php-format msgid "New user at %s" msgstr "" @@ -9753,7 +9759,7 @@ msgstr "" msgid "Newspaper" msgstr "" -#: app/Module/ReviewChangesModule.php:143 +#: app/Module/ReviewChangesModule.php:151 msgid "Next email reminder will be sent after " msgstr "" @@ -9835,7 +9841,7 @@ msgctxt "NOMINATIVE" msgid "Nivose" msgstr "" -#: app/Functions/FunctionsPrintFacts.php:292 +#: app/Functions/FunctionsPrintFacts.php:293 #: resources/views/admin/users-edit.phtml:321 msgid "No" msgstr "" @@ -9894,11 +9900,11 @@ msgstr "" msgid "No file was received. Please try again." msgstr "" -#: app/Module/RelationshipsChartModule.php:374 +#: app/Module/RelationshipsChartModule.php:376 msgid "No link between the two individuals could be found." msgstr "" -#: resources/views/admin/location-edit.phtml:134 +#: resources/views/admin/location-edit.phtml:135 #: resources/views/modules/pedigree-map/chart.phtml:56 #: resources/views/modules/places/tab.phtml:52 #: resources/views/place-map.phtml:59 @@ -9920,7 +9926,7 @@ msgstr "" msgid "No places have been found." msgstr "" -#: app/Http/Controllers/AdminSiteController.php:487 +#: app/Http/Controllers/AdminSiteController.php:488 msgid "No predefined text" msgstr "" @@ -9940,7 +9946,7 @@ msgstr "" msgid "No signed-in and no anonymous users" msgstr "" -#: app/Functions/FunctionsEdit.php:265 +#: app/Functions/FunctionsEdit.php:250 msgid "No temple - living ordinance" msgstr "" @@ -10066,7 +10072,7 @@ msgstr "" #: resources/views/admin/control-panel.phtml:133 #: resources/views/admin/merge-records-step-1.phtml:21 #: resources/views/gedcom-record-page.phtml:62 -#: resources/views/media-page.phtml:57 +#: resources/views/media-page.phtml:72 #: resources/views/modules/census-assistant.phtml:78 #: resources/views/note-page.phtml:62 resources/views/search-results.phtml:53 #: resources/views/source-page.phtml:56 @@ -10294,11 +10300,11 @@ msgstr "" msgid "Only add new records" msgstr "" -#: app/Functions/FunctionsEdit.php:231 -#: app/Functions/FunctionsPrintFacts.php:257 -#: app/Functions/FunctionsPrintFacts.php:431 -#: app/Functions/FunctionsPrintFacts.php:817 -#: app/Functions/FunctionsPrintFacts.php:1059 +#: app/Functions/FunctionsEdit.php:216 +#: app/Functions/FunctionsPrintFacts.php:258 +#: app/Functions/FunctionsPrintFacts.php:432 +#: app/Functions/FunctionsPrintFacts.php:818 +#: app/Functions/FunctionsPrintFacts.php:1060 #: resources/views/modals/restriction-fields.phtml:28 msgid "Only managers can edit" msgstr "" @@ -10382,7 +10388,7 @@ msgstr "" msgid "Other" msgstr "" -#: resources/views/admin/trees-preferences.phtml:444 +#: resources/views/admin/trees-preferences.phtml:424 msgid "Other facts to show in charts" msgstr "" @@ -10390,7 +10396,7 @@ msgstr "" msgid "Other genealogy applications might not recognize this data." msgstr "" -#: resources/views/admin/trees-preferences.phtml:912 +#: resources/views/admin/trees-preferences.phtml:892 msgid "Other preferences" msgstr "" @@ -10530,15 +10536,14 @@ msgid "Parent’s age" msgstr "" #. I18N: A configuration setting -#: resources/views/admin/site-mail.phtml:101 +#: resources/views/admin/site-mail.phtml:134 #: resources/views/admin/users-create.phtml:40 #: resources/views/admin/users-edit.phtml:48 #: resources/views/edit-account-page.phtml:68 -#: resources/views/emails/password-reset-html.phtml:14 -#: resources/views/emails/password-reset-text.phtml:7 -#: resources/views/login-page.phtml:33 +#: resources/views/login-page.phtml:44 #: resources/views/modules/login_block/sign-in.phtml:17 -#: resources/views/register-page.phtml:56 +#: resources/views/password-reset-page.phtml:33 +#: resources/views/register-page.phtml:68 #: resources/views/setup/step-5-administrator.phtml:56 msgid "Password" msgstr "" @@ -10546,7 +10551,8 @@ msgstr "" #: resources/views/admin/users-create.phtml:45 #: resources/views/admin/users-edit.phtml:53 #: resources/views/edit-account-page.phtml:73 -#: resources/views/register-page.phtml:61 +#: resources/views/password-reset-page.phtml:38 +#: resources/views/register-page.phtml:74 msgid "Passwords must be at least 8 characters long and are case-sensitive, so that “secret” is different from “SECRET”." msgstr "" @@ -10589,8 +10595,8 @@ msgstr "" #. I18N: Name of a module #: app/Http/Controllers/HelpTextController.php:240 #: app/Http/Controllers/PendingChangesController.php:302 -#: app/Module/ModuleThemeTrait.php:411 app/Module/ReviewChangesModule.php:63 -#: app/Module/ReviewChangesModule.php:115 +#: app/Module/ModuleThemeTrait.php:411 app/Module/ReviewChangesModule.php:71 +#: app/Module/ReviewChangesModule.php:123 #: resources/views/admin/control-panel-manager.phtml:44 #: resources/views/admin/control-panel-tree-list.phtml:31 #: resources/views/admin/control-panel.phtml:127 @@ -10682,7 +10688,7 @@ msgstr "" #. I18N: gedcom tag PLAC #: app/GedcomTag.php:929 app/Http/Controllers/HelpTextController.php:215 -#: resources/views/admin/location-edit.phtml:23 +#: resources/views/admin/location-edit.phtml:24 #: resources/views/admin/locations.phtml:12 #: resources/views/lists/families-table.phtml:261 #: resources/views/lists/individuals-table.phtml:277 @@ -10717,7 +10723,7 @@ msgid "Place list" msgstr "" #. I18N: Help text for the “Abbreviate place names” configuration setting -#: resources/views/admin/trees-preferences.phtml:619 +#: resources/views/admin/trees-preferences.phtml:599 msgid "Place names are frequently too long to fit on charts, lists, etc. They can be abbreviated by showing just the first few parts of the name, such as <i>village, county</i>, or the last few part of it, such as <i>region, country</i>." msgstr "" @@ -10844,7 +10850,7 @@ msgstr "" #. I18N: Name of a module #: app/Http/Controllers/PlaceHierarchyController.php:115 #: app/Module/PlacesModule.php:66 -#: resources/views/admin/trees-preferences.phtml:598 +#: resources/views/admin/trees-preferences.phtml:578 #: resources/views/search-replace-page.phtml:33 #: resources/views/statistics/other/places.phtml:10 msgid "Places" @@ -10860,10 +10866,15 @@ msgstr "" msgid "Play" msgstr "" -#: app/Http/Controllers/MessageController.php:214 +#: app/Http/Controllers/MessageController.php:221 msgid "Please enter a valid email address." msgstr "" +#: app/Http/RequestHandlers/PasswordResetAction.php:79 +#: app/Http/RequestHandlers/PasswordResetForm.php:75 +msgid "Please try again." +msgstr "" + #. I18N: a month in the French republican calendar #: app/Date/FrenchDate.php:141 msgctxt "GENITIVE" @@ -10899,7 +10910,7 @@ msgid "Polish" msgstr "" #. I18N: A configuration setting -#: resources/views/admin/site-mail.phtml:60 +#: resources/views/admin/site-mail.phtml:90 #: resources/views/setup/step-4-database-mysql.phtml:44 #: resources/views/setup/step-4-database-pgsql.phtml:38 #: resources/views/setup/step-4-database-sqlsvr.phtml:38 @@ -10967,15 +10978,15 @@ msgctxt "NOMINATIVE" msgid "Prairial" msgstr "" -#: app/Http/Controllers/AdminSiteController.php:489 +#: app/Http/Controllers/AdminSiteController.php:490 msgid "Predefined text that states admin will decide on each request for a user account" msgstr "" -#: app/Http/Controllers/AdminSiteController.php:488 +#: app/Http/Controllers/AdminSiteController.php:489 msgid "Predefined text that states all users can request a user account" msgstr "" -#: app/Http/Controllers/AdminSiteController.php:490 +#: app/Http/Controllers/AdminSiteController.php:491 msgid "Predefined text that states only family members can request a user account" msgstr "" @@ -10989,7 +11000,7 @@ msgstr "" #: resources/views/admin/modules.phtml:61 #: resources/views/admin/modules.phtml:132 #: resources/views/admin/modules.phtml:135 -#: resources/views/admin/modules.phtml:138 resources/views/admin/trees.phtml:58 +#: resources/views/admin/modules.phtml:138 resources/views/admin/trees.phtml:62 #: resources/views/modules/block-template.phtml:6 #: resources/views/modules/block-template.phtml:8 msgid "Preferences" @@ -11043,11 +11054,11 @@ msgid "Print basic events when blank" msgstr "" #: app/Http/Controllers/AdminController.php:266 -#: resources/views/admin/trees.phtml:68 +#: resources/views/admin/trees.phtml:72 msgid "Privacy" msgstr "" -#: app/Http/Controllers/StaticPageController.php:36 +#: app/Http/RequestHandlers/PrivacyPolicy.php:40 msgid "Privacy policy" msgstr "" @@ -11072,6 +11083,10 @@ msgstr "" msgid "Private" msgstr "" +#: resources/views/admin/site-mail.phtml:204 +msgid "Private key" +msgstr "" + #. I18N: gedcom tag PROB #: app/GedcomTag.php:941 msgid "Probate" @@ -11127,19 +11142,19 @@ msgstr "" msgid "Quetzaltenango, Guatemala" msgstr "" -#: resources/views/admin/trees-preferences.phtml:792 +#: resources/views/admin/trees-preferences.phtml:772 msgid "Quick family facts" msgstr "" -#: resources/views/admin/trees-preferences.phtml:738 +#: resources/views/admin/trees-preferences.phtml:718 msgid "Quick individual facts" msgstr "" -#: resources/views/admin/trees-preferences.phtml:874 +#: resources/views/admin/trees-preferences.phtml:854 msgid "Quick repository facts" msgstr "" -#: resources/views/admin/trees-preferences.phtml:833 +#: resources/views/admin/trees-preferences.phtml:813 msgid "Quick source facts" msgstr "" @@ -11282,7 +11297,7 @@ msgstr "" #. I18N: gedcom tag _WT_OBJE_SORT #: app/GedcomTag.php:2075 app/Http/Controllers/EditIndividualController.php:48 -#: resources/views/individual-page.phtml:70 +#: resources/views/individual-page.phtml:85 msgid "Re-order media" msgstr "" @@ -11297,7 +11312,7 @@ msgstr "" #: resources/views/edit-account-page.phtml:26 #: resources/views/emails/register-notify-html.phtml:15 #: resources/views/emails/register-notify-text.phtml:7 -#: resources/views/register-page.phtml:20 +#: resources/views/register-page.phtml:32 msgid "Real name" msgstr "" @@ -11434,7 +11449,7 @@ msgstr "" msgid "Relationship to parents" msgstr "" -#: app/Module/RelationshipsChartModule.php:300 +#: app/Module/RelationshipsChartModule.php:302 #, php-format msgid "Relationship: %s" msgstr "" @@ -11444,14 +11459,14 @@ msgstr "" #: app/Http/Controllers/BranchesController.php:291 #: app/Http/Controllers/BranchesController.php:328 #: app/Module/RelationshipsChartModule.php:123 -#: app/Module/RelationshipsChartModule.php:244 +#: app/Module/RelationshipsChartModule.php:246 #: resources/views/lists/individuals-table.phtml:334 #: resources/views/modules/relationships-chart/config.phtml:17 msgid "Relationships" msgstr "" #. I18N: %s are individual’s names -#: app/Module/RelationshipsChartModule.php:235 +#: app/Module/RelationshipsChartModule.php:237 #, php-format msgid "Relationships between %1$s and %2$s" msgstr "" @@ -11523,7 +11538,7 @@ msgstr "" msgid "Reno, Nevada, United States" msgstr "" -#: resources/views/admin/trees.phtml:183 +#: resources/views/admin/trees.phtml:191 msgid "Renumber" msgstr "" @@ -11564,7 +11579,7 @@ msgid "Reports" msgstr "รายงาน" #. I18N: Name of a module/list -#: app/Http/Controllers/AdminTreesController.php:2068 +#: app/Http/Controllers/AdminTreesController.php:2061 #: app/Http/Controllers/ListController.php:487 #: app/Module/RepositoryListModule.php:45 #: resources/views/admin/control-panel-manager.phtml:48 @@ -11582,7 +11597,7 @@ msgstr "" #. I18N: gedcom tag REPO #: app/GedcomTag.php:962 resources/views/admin/trees-privacy.phtml:176 -#: resources/views/admin/trees.phtml:231 +#: resources/views/admin/trees.phtml:239 #: resources/views/modals/source-fields.phtml:35 #: resources/views/modules/favorites/favorites.phtml:111 #: resources/views/modules/recent_changes/changes-table.phtml:49 @@ -11598,14 +11613,15 @@ msgstr "" msgid "Republic of the Congo" msgstr "" -#: app/Http/Controllers/Auth/ForgotPasswordController.php:45 +#: app/Http/RequestHandlers/PasswordRequestAction.php:86 +#: app/Http/RequestHandlers/PasswordRequestForm.php:47 #: resources/views/modules/login_block/sign-in.phtml:43 msgid "Request a new password" msgstr "" -#: app/Http/Controllers/Auth/RegisterController.php:74 -#: app/Http/Controllers/Auth/RegisterController.php:177 -#: app/Module/WelcomeBlockModule.php:111 resources/views/login-page.phtml:58 +#: app/Http/Controllers/Auth/RegisterController.php:83 +#: app/Http/Controllers/Auth/RegisterController.php:185 +#: app/Module/WelcomeBlockModule.php:111 resources/views/login-page.phtml:66 #: resources/views/modules/login_block/sign-in.phtml:35 msgid "Request a new user account" msgstr "" @@ -11628,7 +11644,7 @@ msgstr "" msgid "Research tasks are stored using the custom GEDCOM tag “_TODO”. Other genealogy applications may not recognize this tag." msgstr "" -#: resources/views/admin/location-edit.phtml:133 +#: resources/views/admin/location-edit.phtml:134 #: resources/views/modules/pedigree-map/chart.phtml:55 #: resources/views/modules/places/tab.phtml:51 #: resources/views/place-map.phtml:58 @@ -11652,7 +11668,7 @@ msgstr "" #. I18N: gedcom tag RESN #: app/GedcomTag.php:972 app/Http/Controllers/HelpTextController.php:220 -#: resources/views/media-page.phtml:152 +#: resources/views/media-page.phtml:169 msgid "Restriction" msgstr "" @@ -11727,15 +11743,15 @@ msgstr "" msgid "Rwanda" msgstr "" -#: resources/views/admin/site-mail.phtml:42 +#: resources/views/admin/site-mail.phtml:71 msgid "SMTP mail server" msgstr "" -#: app/Services/ServerCheckService.php:278 +#: app/Services/ServerCheckService.php:320 msgid "SQLite is only suitable for small sites, testing and evaluation." msgstr "" -#: app/Services/ServerCheckService.php:202 +#: app/Services/ServerCheckService.php:213 #, php-format msgid "SQLite version %s is installed. SQLite version %s or later is required." msgstr "" @@ -11964,7 +11980,7 @@ msgid "Second record" msgstr "" #. I18N: A configuration setting -#: resources/views/admin/site-mail.phtml:114 +#: resources/views/admin/site-mail.phtml:148 msgid "Secure connection" msgstr "" @@ -12015,6 +12031,10 @@ msgstr "" msgid "Select two records to merge." msgstr "" +#: resources/views/admin/site-mail.phtml:195 +msgid "Selector" +msgstr "" + #: app/GedcomCode/GedcomCodeRela.php:311 msgid "Seller" msgstr "" @@ -12035,25 +12055,25 @@ msgstr "" msgid "Send" msgstr "" -#: app/Http/Controllers/MessageController.php:169 -#: app/Http/Controllers/MessageController.php:284 +#: app/Http/Controllers/MessageController.php:176 +#: app/Http/Controllers/MessageController.php:291 #: app/Module/UserMessagesModule.php:145 #: app/Statistics/Repository/UserRepository.php:124 #: resources/views/pending-changes-page.phtml:75 msgid "Send a message" msgstr "" -#: app/Http/Controllers/MessageController.php:500 +#: app/Http/Controllers/MessageController.php:506 #: resources/views/admin/control-panel.phtml:273 msgid "Send a message to all users" msgstr "" -#: app/Http/Controllers/MessageController.php:502 +#: app/Http/Controllers/MessageController.php:508 #: resources/views/admin/control-panel.phtml:279 msgid "Send a message to users who have never signed in" msgstr "" -#: app/Http/Controllers/MessageController.php:504 +#: app/Http/Controllers/MessageController.php:510 #: resources/views/admin/control-panel.phtml:285 msgid "Send a message to users who have not signed in for 6 months" msgstr "" @@ -12064,17 +12084,17 @@ msgid "Send out reminder emails" msgstr "" #. I18N: A configuration setting -#: resources/views/admin/site-mail.phtml:32 +#: resources/views/admin/site-mail.phtml:54 msgid "Sender name" msgstr "" -#: app/Http/Controllers/AdminSiteController.php:337 +#: app/Http/Controllers/AdminSiteController.php:342 #: resources/views/admin/control-panel.phtml:69 msgid "Sending email" msgstr "" #. I18N: A configuration setting -#: resources/views/admin/site-mail.phtml:127 +#: resources/views/admin/site-mail.phtml:162 msgid "Sending server name" msgstr "" @@ -12144,20 +12164,24 @@ msgctxt "MALE" msgid "Servant" msgstr "" -#: app/Http/Controllers/AdminSiteController.php:529 +#: app/Http/Controllers/AdminSiteController.php:530 #: resources/views/admin/control-panel.phtml:97 msgid "Server information" msgstr "" #. I18N: A configuration setting -#: resources/views/admin/site-mail.phtml:47 +#: resources/views/admin/site-mail.phtml:76 #: resources/views/setup/step-4-database-mysql.phtml:26 #: resources/views/setup/step-4-database-pgsql.phtml:26 #: resources/views/setup/step-4-database-sqlsvr.phtml:26 msgid "Server name" msgstr "" -#: resources/views/admin/trees.phtml:109 resources/views/admin/trees.phtml:116 +#: app/Http/RequestHandlers/PasswordResetForm.php:64 +msgid "Set a new password" +msgstr "" + +#: resources/views/admin/trees.phtml:116 resources/views/admin/trees.phtml:123 msgid "Set as default" msgstr "" @@ -12189,7 +12213,7 @@ msgid "Set the status to “approved”." msgstr "" #. I18N: Help text for the “Allow users to see raw GEDCOM records” configuration setting -#: resources/views/admin/trees-preferences.phtml:656 +#: resources/views/admin/trees-preferences.phtml:636 msgid "Setting this to <b>Yes</b> will place links on individuals, sources, and families to let users bring up another window containing the raw data taken right out of the GEDCOM file." msgstr "" @@ -12236,9 +12260,9 @@ msgctxt "NOMINATIVE" msgid "Shahrivar" msgstr "" -#: app/GedcomTag.php:1003 resources/views/admin/trees.phtml:255 +#: app/GedcomTag.php:1003 resources/views/admin/trees.phtml:263 #: resources/views/edit/shared-note.phtml:10 -#: resources/views/family-page.phtml:79 resources/views/media-page.phtml:142 +#: resources/views/family-page.phtml:79 resources/views/media-page.phtml:159 #: resources/views/modules/notes/tab.phtml:46 #: resources/views/note-page.phtml:73 msgid "Shared note" @@ -12380,7 +12404,7 @@ msgid "Show" msgstr "" #. I18N: A configuration setting -#: resources/views/admin/trees-preferences.phtml:302 +#: resources/views/admin/trees-preferences.phtml:282 msgid "Show a download link in the media viewer" msgstr "" @@ -12589,7 +12613,7 @@ msgid "Show statistics charts" msgstr "" #. I18N: The placeholders are edit controls. Show the [first/last] [1/2/3/4/5] parts of a place name -#: resources/views/admin/trees-preferences.phtml:614 +#: resources/views/admin/trees-preferences.phtml:594 #, php-format msgid "Show the %1$s %2$s parts of a place name." msgstr "" @@ -12603,7 +12627,7 @@ msgstr "" msgid "Show the date and time of update" msgstr "" -#: resources/views/admin/trees-preferences.phtml:462 +#: resources/views/admin/trees-preferences.phtml:442 msgid "Show the events of close relatives on the individual page" msgstr "" @@ -12637,28 +12661,28 @@ msgstr "" msgid "Show this block for which languages" msgstr "" -#: resources/views/admin/trees-preferences.phtml:324 +#: resources/views/admin/trees-preferences.phtml:304 msgid "Show thumbnail images in charts and family groups." msgstr "" -#: app/Functions/FunctionsEdit.php:92 app/Functions/FunctionsEdit.php:230 -#: app/Functions/FunctionsEdit.php:251 -#: app/Functions/FunctionsPrintFacts.php:254 -#: app/Functions/FunctionsPrintFacts.php:428 -#: app/Functions/FunctionsPrintFacts.php:814 -#: app/Functions/FunctionsPrintFacts.php:1056 +#: app/Functions/FunctionsEdit.php:92 app/Functions/FunctionsEdit.php:215 +#: app/Functions/FunctionsEdit.php:236 +#: app/Functions/FunctionsPrintFacts.php:255 +#: app/Functions/FunctionsPrintFacts.php:429 +#: app/Functions/FunctionsPrintFacts.php:815 +#: app/Functions/FunctionsPrintFacts.php:1057 #: app/Http/Controllers/AdminController.php:372 #: app/Http/Controllers/AdminTreesController.php:1028 #: resources/views/modals/restriction-fields.phtml:17 msgid "Show to managers" msgstr "" -#: app/Functions/FunctionsEdit.php:91 app/Functions/FunctionsEdit.php:229 -#: app/Functions/FunctionsEdit.php:250 -#: app/Functions/FunctionsPrintFacts.php:251 -#: app/Functions/FunctionsPrintFacts.php:425 -#: app/Functions/FunctionsPrintFacts.php:811 -#: app/Functions/FunctionsPrintFacts.php:1053 +#: app/Functions/FunctionsEdit.php:91 app/Functions/FunctionsEdit.php:214 +#: app/Functions/FunctionsEdit.php:235 +#: app/Functions/FunctionsPrintFacts.php:252 +#: app/Functions/FunctionsPrintFacts.php:426 +#: app/Functions/FunctionsPrintFacts.php:812 +#: app/Functions/FunctionsPrintFacts.php:1054 #: app/Http/Controllers/AdminController.php:371 #: app/Http/Controllers/AdminTreesController.php:1027 #: resources/views/admin/trees-privacy.phtml:32 @@ -12667,12 +12691,12 @@ msgstr "" msgid "Show to members" msgstr "" -#: app/Functions/FunctionsEdit.php:90 app/Functions/FunctionsEdit.php:228 -#: app/Functions/FunctionsEdit.php:249 -#: app/Functions/FunctionsPrintFacts.php:248 -#: app/Functions/FunctionsPrintFacts.php:422 -#: app/Functions/FunctionsPrintFacts.php:808 -#: app/Functions/FunctionsPrintFacts.php:1050 +#: app/Functions/FunctionsEdit.php:90 app/Functions/FunctionsEdit.php:213 +#: app/Functions/FunctionsEdit.php:234 +#: app/Functions/FunctionsPrintFacts.php:249 +#: app/Functions/FunctionsPrintFacts.php:423 +#: app/Functions/FunctionsPrintFacts.php:809 +#: app/Functions/FunctionsPrintFacts.php:1051 #: app/Http/Controllers/AdminController.php:370 #: resources/views/admin/trees-privacy.phtml:32 #: resources/views/admin/trees-privacy.phtml:97 @@ -12727,8 +12751,6 @@ msgstr "" #: app/Http/Controllers/Auth/LoginController.php:77 #: app/Module/LoginBlockModule.php:41 app/Module/LoginBlockModule.php:73 #: app/Module/ModuleThemeTrait.php:282 -#: resources/views/emails/password-reset-html.phtml:20 -#: resources/views/emails/password-reset-text.phtml:9 msgid "Sign in" msgstr "ลงชื่อเข้าใช้" @@ -12737,7 +12759,7 @@ msgstr "ลงชื่อเข้าใช้" msgid "Sign out" msgstr "ออกจากระบบ" -#: app/Http/Controllers/AdminSiteController.php:469 +#: app/Http/Controllers/AdminSiteController.php:470 #: resources/views/admin/control-panel.phtml:75 msgid "Sign-in and registration" msgstr "" @@ -12765,7 +12787,7 @@ msgstr "" #. I18N: Help text for the “Preferred contact method” configuration setting #: resources/views/admin/users-edit.phtml:177 -#: resources/views/edit-account-page.phtml:135 +#: resources/views/edit-account-page.phtml:120 msgid "Site members can send each other messages. You can choose to how these messages are sent to you, or choose not receive them at all." msgstr "" @@ -12880,12 +12902,12 @@ msgid "Some genealogy software creates GEDCOM files that contain media filenames msgstr "" #. I18N: Help text for the “Hit counters” configuration setting -#: resources/views/admin/trees-preferences.phtml:686 +#: resources/views/admin/trees-preferences.phtml:666 msgid "Some pages can display the number of times that they have been visited." msgstr "" #. I18N: Help text for the “Fact icons” configuration setting -#: resources/views/admin/trees-preferences.phtml:560 +#: resources/views/admin/trees-preferences.phtml:540 msgid "Some themes can display icons on the “Facts and events” tab." msgstr "" @@ -12936,11 +12958,11 @@ msgstr "" #. I18N: gedcom tag SOUR #. I18N: Name of a module/report -#: app/Functions/FunctionsPrintFacts.php:577 app/GedcomTag.php:1018 +#: app/Functions/FunctionsPrintFacts.php:578 app/GedcomTag.php:1018 #: app/Module/FactSourcesReportModule.php:42 #: resources/views/admin/trees-privacy.phtml:175 -#: resources/views/admin/trees.phtml:221 resources/views/family-page.phtml:103 -#: resources/views/media-page.phtml:132 +#: resources/views/admin/trees.phtml:229 resources/views/family-page.phtml:103 +#: resources/views/media-page.phtml:149 #: resources/views/modals/link-media-to-source.phtml:13 #: resources/views/modules/favorites/favorites.phtml:99 #: resources/views/modules/random_media/slide-show.phtml:70 @@ -12970,19 +12992,19 @@ msgid "Source" msgstr "แหล่งที่มา" #. I18N: Help text for the “Use full source citations” configuration setting -#: resources/views/admin/trees-preferences.phtml:938 +#: resources/views/admin/trees-preferences.phtml:918 msgid "Source citations can include fields to record the quality of the data (primary, secondary, etc.) and the date the event was recorded in the source. If you don’t use these fields, you can disable them when creating new source citations." msgstr "" #. I18N: A configuration setting -#: resources/views/admin/trees-preferences.phtml:948 +#: resources/views/admin/trees-preferences.phtml:928 #: resources/xml/reports/fact_sources.xml:6 msgid "Source type" msgstr "" #. I18N: Name of a module/list #. I18N: Name of a module -#: app/Http/Controllers/AdminTreesController.php:2069 +#: app/Http/Controllers/AdminTreesController.php:2062 #: app/Http/Controllers/ListController.php:504 #: app/Module/SourceListModule.php:45 app/Module/SourcesTabModule.php:57 #: resources/views/admin/control-panel-manager.phtml:47 @@ -12994,7 +13016,7 @@ msgstr "" #: resources/views/lists/notes-table.phtml:84 #: resources/views/lists/repositories-table.phtml:42 #: resources/views/lists/sources-table.phtml:77 -#: resources/views/media-page.phtml:51 +#: resources/views/media-page.phtml:66 #: resources/views/modules/gedcom_stats/config.phtml:23 #: resources/views/modules/gedcom_stats/statistics.phtml:75 #: resources/views/modules/html/template-statistics.phtml:34 @@ -13193,7 +13215,7 @@ msgid "Submitted but not yet cleared" msgstr "" #. I18N: gedcom tag SUBM -#: app/GedcomTag.php:1035 resources/views/admin/trees.phtml:265 +#: app/GedcomTag.php:1035 resources/views/admin/trees.phtml:273 #: resources/views/modules/recent_changes/changes-table.phtml:46 msgid "Submitter" msgstr "" @@ -13220,11 +13242,11 @@ msgstr "" msgid "Support and documentation can be found at %s." msgstr "" -#: app/Services/ServerCheckService.php:283 +#: app/Services/ServerCheckService.php:325 msgid "Support for PostgreSQL is experimental." msgstr "" -#: app/Services/ServerCheckService.php:288 +#: app/Services/ServerCheckService.php:330 msgid "Support for SQL Server is experimental." msgstr "" @@ -13249,7 +13271,7 @@ msgstr "นามสกุล" msgid "Surname distribution chart" msgstr "" -#: resources/views/admin/trees-preferences.phtml:365 +#: resources/views/admin/trees-preferences.phtml:345 msgid "Surname list style" msgstr "" @@ -13262,7 +13284,7 @@ msgstr "" msgid "Surname prefix" msgstr "คำนำหน้านามสกุล" -#: resources/views/admin/trees-preferences.phtml:918 +#: resources/views/admin/trees-preferences.phtml:898 msgid "Surname tradition" msgstr "" @@ -13294,7 +13316,7 @@ msgid "Svalbard and Jan Mayen" msgstr "" #. I18N: Reverse the order of two individuals -#: resources/views/modules/relationships-chart/page.phtml:22 +#: resources/views/modules/relationships-chart/page.phtml:71 msgid "Swap individuals" msgstr "" @@ -13318,7 +13340,7 @@ msgstr "" msgid "Sydney, Australia" msgstr "" -#: resources/views/admin/trees.phtml:368 +#: resources/views/admin/trees.phtml:377 msgid "Synchronize family trees with GEDCOM files" msgstr "" @@ -13332,10 +13354,10 @@ msgstr "" msgid "Tab" msgstr "" -#: resources/views/setup/step-4-database-mysql.phtml:100 -#: resources/views/setup/step-4-database-pgsql.phtml:87 +#: resources/views/setup/step-4-database-mysql.phtml:96 +#: resources/views/setup/step-4-database-pgsql.phtml:83 #: resources/views/setup/step-4-database-sqlite.phtml:55 -#: resources/views/setup/step-4-database-sqlsvr.phtml:86 +#: resources/views/setup/step-4-database-sqlsvr.phtml:83 msgid "Table prefix" msgstr "" @@ -13420,7 +13442,7 @@ msgid "Teal Top" msgstr "" #. I18N: A configuration setting -#: resources/views/admin/trees-preferences.phtml:186 +#: resources/views/admin/trees-preferences.phtml:166 msgid "Technical help contact" msgstr "" @@ -13468,7 +13490,7 @@ msgid "Tevet" msgstr "" #. I18N: gedcom tag TEXT -#: app/GedcomTag.php:1047 resources/views/admin/trees-preferences.phtml:625 +#: app/GedcomTag.php:1047 resources/views/admin/trees-preferences.phtml:605 #: resources/views/modals/source-fields.phtml:49 msgid "Text" msgstr "" @@ -13486,7 +13508,7 @@ msgstr "" msgid "The <b>surname</b> field contains a name that is used for sorting and grouping. It can be different to the individual’s actual surname which is always taken from the <b>name</b> field. This field can be used to sort surnames with or without a prefix (Gogh / van Gogh) and to group spelling variations or inflections (Kowalski / Kowalska). If an individual needs to be listed under more than one surname, each name should be separated by a comma." msgstr "" -#: app/Http/Controllers/AdminTreesController.php:1780 +#: app/Http/Controllers/AdminTreesController.php:1779 #, php-format msgid "The GEDCOM file “%s” has been imported." msgstr "" @@ -13500,12 +13522,12 @@ msgstr "" msgid "The Hague, Netherlands" msgstr "" -#: app/Services/ServerCheckService.php:111 +#: app/Services/ServerCheckService.php:122 #, php-format msgid "The PHP extension “%s” is not installed." msgstr "" -#: app/Services/ServerCheckService.php:169 +#: app/Services/ServerCheckService.php:180 #, php-format msgid "The PHP function “%1$s” is disabled." msgstr "" @@ -13515,12 +13537,12 @@ msgstr "" msgid "The PHP temporary folder is missing." msgstr "" -#: app/Services/ServerCheckService.php:130 +#: app/Services/ServerCheckService.php:141 #, php-format msgid "The PHP.INI setting “%1$s” is disabled." msgstr "" -#: app/Services/ServerCheckService.php:134 +#: app/Services/ServerCheckService.php:145 #, php-format msgid "The PHP.INI setting “%1$s” is enabled." msgstr "" @@ -13565,7 +13587,7 @@ msgstr "" msgid "The data in this website has been collected for the purposes of genealogical research." msgstr "" -#: resources/views/admin/trees-preferences.phtml:414 +#: resources/views/admin/trees-preferences.phtml:394 msgid "The date and time of the last update" msgstr "" @@ -13593,13 +13615,13 @@ msgstr "" #. I18N: %s is the name of a family tree #: app/Http/Controllers/AdminTreesController.php:393 -#: app/Http/Controllers/AdminTreesController.php:1786 +#: app/Http/Controllers/AdminTreesController.php:1785 #, php-format msgid "The family tree “%s” has been deleted." msgstr "" #. I18N: %s is the name of a family tree -#: app/Http/Controllers/AdminTreesController.php:1751 +#: app/Http/Controllers/AdminTreesController.php:1750 #, php-format msgid "The family tree “%s” will be shown to visitors when they first arrive at this website." msgstr "" @@ -13630,13 +13652,13 @@ msgid "The file %s could not be created." msgstr "" #: app/Http/Controllers/Admin/MediaController.php:138 -#: app/Http/Controllers/AdminSiteController.php:149 +#: app/Http/Controllers/AdminSiteController.php:152 #, php-format msgid "The file %s could not be deleted." msgstr "" #: app/Http/Controllers/Admin/MediaController.php:136 -#: app/Http/Controllers/AdminSiteController.php:147 +#: app/Http/Controllers/AdminSiteController.php:150 #, php-format msgid "The file %s has been deleted." msgstr "" @@ -13653,31 +13675,31 @@ msgstr "" #. I18N: %s is a filename #: resources/views/media-list-page.phtml:153 -#: resources/views/media-page.phtml:105 +#: resources/views/media-page.phtml:113 #, php-format msgid "The file “%s” does not exist." msgstr "" -#: app/Http/Controllers/AdminSiteController.php:139 +#: app/Http/Controllers/AdminSiteController.php:142 #, php-format msgid "The folder %s could not be deleted." msgstr "" #: app/Http/Controllers/Admin/MediaController.php:565 -#: app/Http/Controllers/AdminSiteController.php:451 -#: app/Http/Controllers/AdminTreesController.php:1218 +#: app/Http/Controllers/AdminSiteController.php:452 +#: app/Http/Controllers/AdminTreesController.php:1217 #, php-format msgid "The folder %s does not exist, and it could not be created." msgstr "" #: app/Http/Controllers/Admin/MediaController.php:563 #: app/Http/Controllers/Admin/UpgradeController.php:232 -#: app/Http/Controllers/AdminTreesController.php:1216 +#: app/Http/Controllers/AdminTreesController.php:1215 #, php-format msgid "The folder %s has been created." msgstr "" -#: app/Http/Controllers/AdminSiteController.php:137 +#: app/Http/Controllers/AdminSiteController.php:140 #, php-format msgid "The folder %s has been deleted." msgstr "" @@ -13714,12 +13736,12 @@ msgid "The help text has not been written for this item." msgstr "" #. I18N: Help text for the “Technical help contact” configuration setting -#: resources/views/admin/trees-preferences.phtml:198 +#: resources/views/admin/trees-preferences.phtml:178 msgid "The individual to be contacted about technical questions or errors encountered on your website." msgstr "" #. I18N: Help text for the “Genealogy contact” configuration setting -#: resources/views/admin/trees-preferences.phtml:178 +#: resources/views/admin/trees-preferences.phtml:158 msgid "The individual to contact about the genealogy data on this website." msgstr "" @@ -13759,15 +13781,15 @@ msgstr "" msgid "The memory and CPU time requirements depend on the number of individuals in your family tree." msgstr "" -#: app/Http/Controllers/MessageController.php:136 -#: app/Http/Controllers/MessageController.php:248 -#: app/Http/Controllers/MessageController.php:337 +#: app/Http/Controllers/MessageController.php:143 +#: app/Http/Controllers/MessageController.php:255 +#: app/Http/Controllers/MessageController.php:344 msgid "The message was not sent." msgstr "" -#: app/Http/Controllers/MessageController.php:129 -#: app/Http/Controllers/MessageController.php:241 -#: app/Http/Controllers/MessageController.php:330 +#: app/Http/Controllers/MessageController.php:136 +#: app/Http/Controllers/MessageController.php:248 +#: app/Http/Controllers/MessageController.php:337 #, php-format msgid "The message was successfully sent to %s." msgstr "" @@ -13785,22 +13807,22 @@ msgid "The module “%s” has been enabled." msgstr "" #. I18N: Help text for the “Quick family facts” configuration setting -#: resources/views/admin/trees-preferences.phtml:797 +#: resources/views/admin/trees-preferences.phtml:777 msgid "The most common family facts and events are listed separately, so that they can be added more easily." msgstr "" #. I18N: Help text for the “Quick individual facts” configuration setting -#: resources/views/admin/trees-preferences.phtml:743 +#: resources/views/admin/trees-preferences.phtml:723 msgid "The most common individual facts and events are listed separately, so that they can be added more easily." msgstr "" #. I18N: Help text for the “Quick repository facts” configuration setting -#: resources/views/admin/trees-preferences.phtml:879 +#: resources/views/admin/trees-preferences.phtml:859 msgid "The most common repository facts are listed separately, so that they can be added more easily." msgstr "" #. I18N: Help text for the “Quick source facts” configuration setting -#: resources/views/admin/trees-preferences.phtml:838 +#: resources/views/admin/trees-preferences.phtml:818 msgid "The most common source facts are listed separately, so that they can be added more easily." msgstr "" @@ -13817,10 +13839,15 @@ msgid "The password needs to be at least six characters long." msgstr "" #. I18N: Help text for the "Password" site configuration setting -#: resources/views/admin/site-mail.phtml:106 +#: resources/views/admin/site-mail.phtml:140 msgid "The password required for authentication with the SMTP server." msgstr "" +#: app/Http/RequestHandlers/PasswordResetAction.php:78 +#: app/Http/RequestHandlers/PasswordResetForm.php:74 +msgid "The password reset link has expired." +msgstr "" + #. I18N: Description of the “PlaceHierarchyListModule” module #: app/Module/PlaceHierarchyListModule.php:56 msgid "The place hierarchy." @@ -13837,7 +13864,7 @@ msgid "The preferences for new family trees have been updated." msgstr "" #: app/Http/Controllers/AdminController.php:349 -#: app/Http/Controllers/AdminTreesController.php:1238 +#: app/Http/Controllers/AdminTreesController.php:1237 #, php-format msgid "The preferences for the family tree “%s” have been updated." msgstr "" @@ -13853,10 +13880,10 @@ msgstr "" msgid "The preferences for the module “%s” have been updated." msgstr "" -#: resources/views/setup/step-4-database-mysql.phtml:105 -#: resources/views/setup/step-4-database-pgsql.phtml:92 +#: resources/views/setup/step-4-database-mysql.phtml:101 +#: resources/views/setup/step-4-database-pgsql.phtml:88 #: resources/views/setup/step-4-database-sqlite.phtml:62 -#: resources/views/setup/step-4-database-sqlsvr.phtml:91 +#: resources/views/setup/step-4-database-sqlsvr.phtml:88 msgid "The prefix is optional, but recommended. By giving the table names a unique prefix you can let several different applications share the same database." msgstr "" @@ -13896,11 +13923,11 @@ msgstr "" msgid "The server configuration is OK." msgstr "" -#: app/Services/ServerCheckService.php:222 +#: app/Services/ServerCheckService.php:245 msgid "The server’s temporary folder cannot be accessed." msgstr "" -#: app/Http/Controllers/AdminTreesController.php:1731 +#: app/Http/Controllers/AdminTreesController.php:1730 #: app/Services/UpgradeService.php:146 app/Services/UpgradeService.php:179 msgid "The server’s time limit has been reached." msgstr "" @@ -13945,7 +13972,7 @@ msgstr "" msgid "The uploaded file exceeds the allowed size." msgstr "" -#: app/Http/Controllers/Admin/UsersController.php:131 +#: app/Http/Controllers/Admin/UsersController.php:139 #, php-format msgid "The user %s has been deleted." msgstr "" @@ -13961,18 +13988,18 @@ msgid "The username or password is incorrect." msgstr "" #. I18N: Help text for the "Username" site configuration setting -#: resources/views/admin/site-mail.phtml:93 +#: resources/views/admin/site-mail.phtml:126 msgid "The username required for authentication with the SMTP server." msgstr "" #. I18N: Help text for the “Description META tag” configuration setting -#: resources/views/admin/trees-preferences.phtml:240 +#: resources/views/admin/trees-preferences.phtml:220 msgid "The value to place in the “meta description” tag in the HTML page header. Leave this field empty to use the name of the family tree." msgstr "" -#: app/Http/Controllers/AdminSiteController.php:403 -#: app/Http/Controllers/AdminSiteController.php:458 -#: app/Http/Controllers/AdminSiteController.php:509 +#: app/Http/Controllers/AdminSiteController.php:404 +#: app/Http/Controllers/AdminSiteController.php:459 +#: app/Http/Controllers/AdminSiteController.php:510 msgid "The website preferences have been updated." msgstr "" @@ -13990,7 +14017,6 @@ msgstr "" #: resources/views/admin/modules.phtml:241 #: resources/views/admin/modules.phtml:244 #: resources/views/admin/users-edit.phtml:185 -#: resources/views/edit-account-page.phtml:116 msgid "Theme" msgstr "กระทู้" @@ -14039,7 +14065,7 @@ msgstr "" msgid "There are no source citations for this individual." msgstr "" -#: app/Module/ReviewChangesModule.php:136 +#: app/Module/ReviewChangesModule.php:144 #: resources/views/emails/pending-changes-html.phtml:8 #: resources/views/emails/pending-changes-text.phtml:5 msgid "There are pending changes for you to moderate." @@ -14051,9 +14077,9 @@ msgid "There have been no changes within the last %s day." msgid_plural "There have been no changes within the last %s days." msgstr[0] "" -#: app/Http/Controllers/Auth/ForgotPasswordController.php:93 +#: app/Http/RequestHandlers/PasswordRequestAction.php:97 #, php-format -msgid "There is no account with the username or email “%s”." +msgid "There is no user account with the email “%s”." msgstr "" #: app/Http/Controllers/Admin/MediaController.php:581 @@ -14107,7 +14133,7 @@ msgstr "" #: resources/views/admin/users-create.phtml:58 #: resources/views/admin/users-edit.phtml:66 #: resources/views/edit-account-page.phtml:108 -#: resources/views/register-page.phtml:37 +#: resources/views/register-page.phtml:49 #: resources/views/setup/step-5-administrator.phtml:73 msgid "This email address will be used to send password reminders, website notifications, and messages from other family members who are registered on the website." msgstr "" @@ -14164,7 +14190,7 @@ msgid "This folder will be used by webtrees to store media files, GEDCOM files, msgstr "" #. I18N: Help text for the “Media folder” configuration setting -#: resources/views/admin/trees-preferences.phtml:276 +#: resources/views/admin/trees-preferences.phtml:256 msgid "This folder will be used to store the media files for this family tree." msgstr "" @@ -14177,28 +14203,28 @@ msgstr "" msgid "This individual does not exist or you do not have permission to view it." msgstr "" -#: resources/views/individual-page.phtml:13 +#: resources/views/individual-page.phtml:28 msgid "This individual has been deleted. The deletion will need to be reviewed by a moderator." msgstr "" #. I18N: %1$s is “accept”, %2$s is “reject”. These are links. -#: resources/views/individual-page.phtml:10 +#: resources/views/individual-page.phtml:25 #, php-format msgid "This individual has been deleted. You should review the deletion and then %1$s or %2$s it." msgstr "" -#: resources/views/individual-page.phtml:22 +#: resources/views/individual-page.phtml:37 msgid "This individual has been edited. The changes need to be reviewed by a moderator." msgstr "" #. I18N: %1$s is “accept”, %2$s is “reject”. These are links. -#: resources/views/individual-page.phtml:19 +#: resources/views/individual-page.phtml:34 #, php-format msgid "This individual has been edited. You should review the changes and then %1$s or %2$s them." msgstr "" #. I18N: Help text for the “Default individual” configuration setting -#: resources/views/admin/trees-preferences.phtml:86 +#: resources/views/admin/trees-preferences.phtml:87 #: resources/views/edit-account-page.phtml:61 msgid "This individual will be selected by default when viewing charts and reports." msgstr "" @@ -14252,22 +14278,22 @@ msgid "This information is private and cannot be shown." msgstr "" #. I18N: Help text for the “Advanced name facts” configuration setting -#: resources/views/admin/trees-preferences.phtml:894 +#: resources/views/admin/trees-preferences.phtml:874 msgid "This is a comma separated list of GEDCOM fact tags that will be shown on the add/edit name form. If you use non-Latin alphabets such as Hebrew, Greek, Cyrillic, or Arabic, you may want to add tags such as _HEB, ROMN, FONE, etc. to allow you to store names in several different alphabets." msgstr "" #. I18N: Help text for the “Facts for new families” configuration setting -#: resources/views/admin/trees-preferences.phtml:784 +#: resources/views/admin/trees-preferences.phtml:764 msgid "This is a comma separated list of GEDCOM fact tags that will be shown when adding a new family. For example, if MARR is in the list, then fields for marriage date and marriage place will be shown on the form." msgstr "" #. I18N: Help text for the “Facts for new individuals” configuration setting -#: resources/views/admin/trees-preferences.phtml:730 +#: resources/views/admin/trees-preferences.phtml:710 msgid "This is a comma separated list of GEDCOM fact tags that will be shown when adding a new individual. For example, if BIRT is in the list, fields for birth date and birth place will be shown on the form." msgstr "" #. I18N: Help text for the “Advanced place name facts” configuration setting -#: resources/views/admin/trees-preferences.phtml:907 +#: resources/views/admin/trees-preferences.phtml:887 msgid "This is a comma separated list of GEDCOM fact tags that will be shown when you add or edit place names. If you use non-Latin alphabets such as Hebrew, Greek, Cyrillic, or Arabic, you may want to add tags such as _HEB, ROMN, FONE, etc. to allow you to store place names in several different alphabets." msgstr "" @@ -14291,79 +14317,83 @@ msgid "This is the latest version of webtrees. No upgrade is available." msgstr "" #. I18N: Help text for the “All family facts” configuration setting -#: resources/views/admin/trees-preferences.phtml:758 +#: resources/views/admin/trees-preferences.phtml:738 msgid "This is the list of GEDCOM facts that your users can add to families. You can modify this list by removing or adding fact names, even custom ones, as necessary. Fact names that appear in this list must not also appear in the “Unique family facts” list." msgstr "" #. I18N: Help text for the “All individual facts” configuration setting -#: resources/views/admin/trees-preferences.phtml:704 +#: resources/views/admin/trees-preferences.phtml:684 msgid "This is the list of GEDCOM facts that your users can add to individuals. You can modify this list by removing or adding fact names, even custom ones, as necessary. Fact names that appear in this list must not also appear in the “Unique individual facts” list." msgstr "" #. I18N: Help text for the “All repository facts” configuration setting -#: resources/views/admin/trees-preferences.phtml:853 +#: resources/views/admin/trees-preferences.phtml:833 msgid "This is the list of GEDCOM facts that your users can add to repositories. You can modify this list by removing or adding fact names, even custom ones, as necessary. Fact names that appear in this list must not also appear in the “Unique repository facts” list." msgstr "" #. I18N: Help text for the “All source facts” configuration setting -#: resources/views/admin/trees-preferences.phtml:812 +#: resources/views/admin/trees-preferences.phtml:792 msgid "This is the list of GEDCOM facts that your users can add to sources. You can modify this list by removing or adding fact names, even custom ones, as necessary. Fact names that appear in this list must not also appear in the “Unique source facts” list." msgstr "" #. I18N: Help text for the “Unique family facts” configuration setting -#: resources/views/admin/trees-preferences.phtml:771 +#: resources/views/admin/trees-preferences.phtml:751 msgid "This is the list of GEDCOM facts that your users can only add once to families. For example, if MARR is in this list, users will not be able to add more than one MARR record to a family. Fact names that appear in this list must not also appear in the “All family facts” list." msgstr "" #. I18N: Help text for the “Unique individual facts” configuration setting -#: resources/views/admin/trees-preferences.phtml:717 +#: resources/views/admin/trees-preferences.phtml:697 msgid "This is the list of GEDCOM facts that your users can only add once to individuals. For example, if BIRT is in this list, users will not be able to add more than one BIRT record to an individual. Fact names that appear in this list must not also appear in the “All individual facts” list." msgstr "" #. I18N: Help text for the “Unique repository facts” configuration setting -#: resources/views/admin/trees-preferences.phtml:866 +#: resources/views/admin/trees-preferences.phtml:846 msgid "This is the list of GEDCOM facts that your users can only add once to repositories. For example, if NAME is in this list, users will not be able to add more than one NAME record to a repository. Fact names that appear in this list must not also appear in the “All repository facts” list." msgstr "" #. I18N: Help text for the “Unique source facts” configuration setting -#: resources/views/admin/trees-preferences.phtml:825 +#: resources/views/admin/trees-preferences.phtml:805 msgid "This is the list of GEDCOM facts that your users can only add once to sources. For example, if TITL is in this list, users will not be able to add more than one TITL record to a source. Fact names that appear in this list must not also appear in the “All source facts” list." msgstr "" #. I18N: Help text for the “Server name” site configuration setting -#: resources/views/admin/site-mail.phtml:52 +#: resources/views/admin/site-mail.phtml:82 msgid "This is the name of the SMTP server. “localhost” means that the mail service is running on the same computer as your web server." msgstr "" #: resources/views/admin/users-create.phtml:19 #: resources/views/admin/users-edit.phtml:27 #: resources/views/edit-account-page.phtml:31 -#: resources/views/register-page.phtml:25 +#: resources/views/register-page.phtml:37 #: resources/views/setup/step-5-administrator.phtml:37 msgid "This is your real name, as you would like it displayed on screen." msgstr "" +#: app/Http/RequestHandlers/PasswordRequestAction.php:94 +msgid "This link is valid for one hour." +msgstr "" + #: app/Exceptions/MediaAccessDeniedException.php:33 #: app/Exceptions/MediaNotFoundException.php:33 msgid "This media object does not exist or you do not have permission to view it." msgstr "" -#: resources/views/media-page.phtml:11 +#: resources/views/media-page.phtml:26 msgid "This media object has been deleted. The deletion will need to be reviewed by a moderator." msgstr "" #. I18N: %1$s is “accept”, %2$s is “reject”. These are links. -#: resources/views/media-page.phtml:9 +#: resources/views/media-page.phtml:24 #, php-format msgid "This media object has been deleted. You should review the deletion and then %1$s or %2$s it." msgstr "" -#: resources/views/media-page.phtml:17 +#: resources/views/media-page.phtml:32 msgid "This media object has been edited. The changes need to be reviewed by a moderator." msgstr "" #. I18N: %1$s is “accept”, %2$s is “reject”. These are links. -#: resources/views/media-page.phtml:15 +#: resources/views/media-page.phtml:30 #, php-format msgid "This media object has been edited. You should review the changes and then %1$s or %2$s them." msgstr "" @@ -14380,7 +14410,7 @@ msgid "This must be at least six characters long. It is case-sensitive." msgstr "" #. I18N: Help text for the “Sender name” site configuration setting -#: resources/views/admin/site-mail.phtml:37 +#: resources/views/admin/site-mail.phtml:60 msgid "This name is used in the “From” field, when sending automatic emails from this server." msgstr "" @@ -14410,27 +14440,27 @@ msgid "This note has been edited. You should review the changes and then %1$s or msgstr "" #. I18N: Help text for the “Automatically expand notes” configuration setting -#: resources/views/admin/trees-preferences.phtml:576 +#: resources/views/admin/trees-preferences.phtml:556 msgid "This option controls whether or not to automatically display content of a <i>Note</i> record on the Individual page." msgstr "" #. I18N: Help text for the “Automatically expand sources” configuration setting -#: resources/views/admin/trees-preferences.phtml:592 +#: resources/views/admin/trees-preferences.phtml:572 msgid "This option controls whether or not to automatically display content of a <i>Source</i> record on the Individual page." msgstr "" #. I18N: Help text for the “Age of parents next to child’s birthdate” configuration setting -#: resources/views/admin/trees-preferences.phtml:435 +#: resources/views/admin/trees-preferences.phtml:415 msgid "This option controls whether or not to show age of father and mother next to child’s birthdate on charts." msgstr "" #. I18N: Help text for the “Estimated dates for birth and death” configuration setting -#: resources/views/admin/trees-preferences.phtml:404 +#: resources/views/admin/trees-preferences.phtml:384 msgid "This option controls whether or not to show estimated dates for birth and death instead of leaving blanks on individual lists and charts for individuals whose dates are not known." msgstr "" #. I18N: Help text for the “Show a download link in the media viewer” configuration setting -#: resources/views/admin/trees-preferences.phtml:307 +#: resources/views/admin/trees-preferences.phtml:287 msgid "This option will make it easier for users to download images." msgstr "" @@ -14539,7 +14569,7 @@ msgid "This server’s memory limit is %s MB and its CPU time limit is %s second msgstr "" #. I18N: Help text for the “Other facts to show in charts” configuration setting -#: resources/views/admin/trees-preferences.phtml:451 +#: resources/views/admin/trees-preferences.phtml:431 msgid "This should be a comma or space separated list of facts, in addition to birth and death, that you want to appear in chart boxes such as the pedigree chart. This list requires you to use fact tags as defined in the GEDCOM 5.5.1 standard. For example, if you wanted the occupation to show up in the box, you would add “OCCU” to this field." msgstr "" @@ -14577,7 +14607,7 @@ msgid "This source has been edited. You should review the changes and then %1$s msgstr "" #. I18N: Help text for the “Add to TITLE header tag” configuration setting -#: resources/views/admin/trees-preferences.phtml:220 +#: resources/views/admin/trees-preferences.phtml:200 msgid "This text will be appended to each page title. It will be shown in the browser’s title bar, bookmarks, etc." msgstr "" @@ -14631,8 +14661,8 @@ msgstr "" msgid "Thumbnail image" msgstr "" -#: resources/views/admin/trees-preferences.phtml:313 -#: resources/views/admin/trees-preferences.phtml:319 +#: resources/views/admin/trees-preferences.phtml:293 +#: resources/views/admin/trees-preferences.phtml:299 msgid "Thumbnail images" msgstr "" @@ -14763,7 +14793,7 @@ msgid "To create new research tasks, you must first add “research task” to t msgstr "" #. I18N: Help text for the “Format text and notes” configuration setting -#: resources/views/admin/trees-preferences.phtml:636 +#: resources/views/admin/trees-preferences.phtml:616 msgid "To ensure compatibility with other genealogy applications, notes, text, and transcripts should be recorded in simple, unformatted text. However, formatting is often desirable to aid presentation, comprehension, etc." msgstr "" @@ -14776,6 +14806,11 @@ msgstr "" msgid "To reduce the size of the download, you can compress the data into a .ZIP file. You will need to uncompress the .ZIP file before you can use it." msgstr "" +#: resources/views/emails/password-request-html.phtml:9 +#: resources/views/emails/password-request-text.phtml:5 +msgid "To set a new password, follow this link." +msgstr "" + #. I18N: Help text for the "Custom welcome text" site configuration setting #: resources/views/admin/site-registration.phtml:31 msgid "To set this text for other languages, you must switch to that language, and visit this page again." @@ -14789,7 +14824,7 @@ msgstr "" msgid "To tell search engines that sitemaps are available, you should add the following line to your robots.txt file." msgstr "" -#: resources/views/admin/site-mail.phtml:10 +#: resources/views/admin/site-mail.phtml:31 msgid "To use a Google mail account, use the following settings: server=smtp.gmail.com, port=587, security=tls, username=xxxxx@gmail.com, password=[your gmail password]" msgstr "" @@ -15064,7 +15099,7 @@ msgid "Twin Falls, Idaho, United States" msgstr "" #. I18N: gedcom tag TYPE -#: app/Functions/FunctionsPrintFacts.php:672 app/GedcomTag.php:1065 +#: app/Functions/FunctionsPrintFacts.php:673 app/GedcomTag.php:1065 #: app/Statistics/Google/ChartFamilyLargest.php:100 #: app/Statistics/Google/ChartFamilyWithSources.php:72 #: app/Statistics/Google/ChartIndividualWithSources.php:72 @@ -15091,8 +15126,8 @@ msgstr "" #. I18N: gedcom tag _URL #. I18N: A configuration setting #: app/GedcomTag.php:1068 app/GedcomTag.php:1080 app/GedcomTag.php:2066 -#: resources/views/admin/trees-preferences.phtml:42 -#: resources/views/admin/trees.phtml:328 +#: resources/views/admin/trees-preferences.phtml:43 +#: resources/views/admin/trees.phtml:336 #: resources/views/modals/media-file-fields.phtml:87 #: resources/views/modules/favorites/favorites.phtml:123 #: resources/views/modules/favorites/favorites.phtml:128 @@ -15125,7 +15160,7 @@ msgstr "" msgid "Uncleared: insufficient data" msgstr "" -#: resources/views/admin/trees-preferences.phtml:766 +#: resources/views/admin/trees-preferences.phtml:746 msgid "Unique family facts" msgstr "" @@ -15135,19 +15170,19 @@ msgid "Unique identifier" msgstr "" #. I18N: Help text for the “Add unique identifiers” configuration setting -#: resources/views/admin/trees-preferences.phtml:134 +#: resources/views/admin/trees-preferences.phtml:135 msgid "Unique identifiers allow the same record to be found in different family trees and in different systems. They will be added whenever records are created or updated. If you do not want unique identifiers to be displayed, you can hide them using the privacy rules." msgstr "" -#: resources/views/admin/trees-preferences.phtml:712 +#: resources/views/admin/trees-preferences.phtml:692 msgid "Unique individual facts" msgstr "" -#: resources/views/admin/trees-preferences.phtml:861 +#: resources/views/admin/trees-preferences.phtml:841 msgid "Unique repository facts" msgstr "" -#: resources/views/admin/trees-preferences.phtml:820 +#: resources/views/admin/trees-preferences.phtml:800 msgid "Unique source facts" msgstr "" @@ -15178,8 +15213,8 @@ msgctxt "unknown century" msgid "Unknown" msgstr "" -#: app/Functions/FunctionsEdit.php:546 -#: app/Http/Controllers/IndividualController.php:320 +#: app/Functions/FunctionsEdit.php:531 +#: app/Http/Controllers/IndividualController.php:323 #: resources/xml/reports/family_group_report.xml:844 #: resources/xml/reports/individual_ext_report.xml:391 #: resources/xml/reports/individual_ext_report.xml:598 @@ -15227,7 +15262,7 @@ msgstr "" #. I18N: Renumber the records in a family tree #: app/Http/Controllers/AdminTreesController.php:943 -#: resources/views/admin/trees.phtml:153 +#: resources/views/admin/trees.phtml:161 msgid "Update place names" msgstr "" @@ -15259,7 +15294,7 @@ msgstr "" msgid "Uruguay" msgstr "" -#: app/Http/Controllers/AdminSiteController.php:372 +#: app/Services/MailService.php:232 msgid "Use SMTP to send messages" msgstr "" @@ -15270,7 +15305,7 @@ msgstr "" #. I18N: placeholder text for new-password field #: resources/views/admin/users-create.phtml:43 #: resources/views/admin/users-edit.phtml:51 -#: resources/views/register-page.phtml:59 +#: resources/views/register-page.phtml:72 #, php-format msgid "Use at least %s character." msgid_plural "Use at least %s characters." @@ -15287,38 +15322,35 @@ msgid "Use compact layout" msgstr "" #. I18N: A configuration setting -#: resources/views/admin/trees-preferences.phtml:933 +#: resources/views/admin/trees-preferences.phtml:913 msgid "Use full source citations" msgstr "" -#: resources/views/setup/step-4-database-mysql.phtml:93 -#: resources/views/setup/step-4-database-mysql.phtml:106 -#: resources/views/setup/step-4-database-pgsql.phtml:80 -#: resources/views/setup/step-4-database-pgsql.phtml:93 +#: resources/views/setup/step-4-database-mysql.phtml:102 +#: resources/views/setup/step-4-database-pgsql.phtml:89 #: resources/views/setup/step-4-database-sqlite.phtml:48 #: resources/views/setup/step-4-database-sqlite.phtml:63 -#: resources/views/setup/step-4-database-sqlsvr.phtml:79 -#: resources/views/setup/step-4-database-sqlsvr.phtml:92 +#: resources/views/setup/step-4-database-sqlsvr.phtml:89 msgid "Use letters A-Z, a-z, digits 0-9, or underscores" msgstr "" #. I18N: A configuration setting -#: resources/views/admin/site-mail.phtml:74 +#: resources/views/admin/site-mail.phtml:105 msgid "Use password" msgstr "" #. I18N: "sendmail" is the name of some mail software -#: app/Http/Controllers/AdminSiteController.php:371 +#: app/Services/MailService.php:231 msgid "Use sendmail to send messages" msgstr "" #. I18N: Help text for the “Use silhouettes” configuration setting -#: resources/views/admin/trees-preferences.phtml:339 +#: resources/views/admin/trees-preferences.phtml:319 msgid "Use silhouette images when no highlighted image for that individual has been specified. The images used are specific to the gender of the individual in question." msgstr "" #. I18N: A configuration setting -#: resources/views/admin/trees-preferences.phtml:334 +#: resources/views/admin/trees-preferences.phtml:314 msgid "Use silhouettes" msgstr "" @@ -15326,11 +15358,11 @@ msgstr "" msgid "Use the GeoNames database for autocomplete on places" msgstr "" -#: resources/views/register-page.phtml:73 +#: resources/views/register-page.phtml:87 msgid "Use this field to tell the site administrator why you are requesting an account and how you are related to the genealogy displayed on this site. You can also use this to enter any other comments you may have for the site administrator." msgstr "" -#: app/Functions/FunctionsEdit.php:570 +#: app/Functions/FunctionsEdit.php:555 msgid "Use this image for charts and on the individual’s page." msgstr "" @@ -15343,7 +15375,7 @@ msgstr "" msgid "User" msgstr "" -#: app/Http/Controllers/Admin/UsersController.php:154 +#: app/Http/Controllers/Admin/UsersController.php:162 #: resources/views/admin/control-panel.phtml:245 #: resources/views/admin/users-cleanup.phtml:4 #: resources/views/admin/users-create.phtml:4 @@ -15359,34 +15391,33 @@ msgstr "" msgid "User not verified by administrator." msgstr "" -#: resources/views/admin/trees-preferences.phtml:245 +#: resources/views/admin/trees-preferences.phtml:225 msgid "User preferences" msgstr "" -#: app/Http/Controllers/Auth/RegisterController.php:232 -#: app/Http/Controllers/Auth/VerifyEmailController.php:51 +#: app/Http/Controllers/Auth/RegisterController.php:240 +#: app/Http/Controllers/Auth/VerifyEmailController.php:65 msgid "User verification" msgstr "" #. I18N: A configuration setting -#: resources/views/admin/site-mail.phtml:88 +#: resources/views/admin/site-mail.phtml:120 #: resources/views/admin/users-create.phtml:27 #: resources/views/admin/users-edit.phtml:35 #: resources/views/admin/users.phtml:15 #: resources/views/edit-account-page.phtml:14 -#: resources/views/emails/password-reset-html.phtml:12 -#: resources/views/emails/password-reset-text.phtml:6 #: resources/views/emails/register-notify-html.phtml:13 #: resources/views/emails/register-notify-text.phtml:6 -#: resources/views/login-page.phtml:24 +#: resources/views/login-page.phtml:35 #: resources/views/modules/login_block/sign-in.phtml:10 #: resources/views/modules/todo/research-tasks.phtml:13 -#: resources/views/register-page.phtml:44 +#: resources/views/password-reset-page.phtml:24 +#: resources/views/register-page.phtml:56 #: resources/views/setup/step-5-administrator.phtml:44 msgid "Username" msgstr "" -#: resources/views/forgot-password-page.phtml:13 +#: resources/views/forgot-password-page.phtml:20 #: resources/views/modules/login_block/sign-in.phtml:46 msgid "Username or email address" msgstr "" @@ -15394,7 +15425,7 @@ msgstr "" #: resources/views/admin/users-create.phtml:32 #: resources/views/admin/users-edit.phtml:40 #: resources/views/edit-account-page.phtml:19 -#: resources/views/register-page.phtml:49 +#: resources/views/register-page.phtml:61 msgid "Usernames are case-insensitive and ignore accented letters, so that “chloe”, “chloë”, and “Chloe” are considered to be the same." msgstr "" @@ -15515,7 +15546,7 @@ msgstr "" msgid "Vietnam" msgstr "" -#: app/Functions/FunctionsPrintFacts.php:1024 +#: app/Functions/FunctionsPrintFacts.php:1025 msgid "View" msgstr "" @@ -15528,8 +15559,8 @@ msgstr "" msgid "View this day" msgstr "" -#: app/Functions/FunctionsPrintFacts.php:220 -#: app/Functions/FunctionsPrintFacts.php:691 +#: app/Functions/FunctionsPrintFacts.php:221 +#: app/Functions/FunctionsPrintFacts.php:692 #: app/Statistics/Repository/FamilyRepository.php:464 #: resources/views/statistics/families/top10-list-age.phtml:24 #: resources/views/statistics/families/top10-nolist-age.phtml:24 @@ -15551,18 +15582,18 @@ msgstr "" #. I18N: A configuration setting #: resources/views/admin/users-edit.phtml:153 -#: resources/views/edit-account-page.phtml:143 +#: resources/views/edit-account-page.phtml:128 msgid "Visible online" msgstr "" #. I18N: A configuration setting #: resources/views/admin/users-edit.phtml:159 -#: resources/views/edit-account-page.phtml:146 +#: resources/views/edit-account-page.phtml:131 msgid "Visible to other users when online" msgstr "" #. I18N: Listbox entry; name of a role -#: app/Http/Controllers/Admin/UsersController.php:468 +#: app/Http/Controllers/Admin/UsersController.php:476 #: resources/views/admin/trees-export.phtml:103 #: resources/views/admin/users-edit.phtml:225 #: resources/views/modules/clippings/download.phtml:27 @@ -15607,12 +15638,12 @@ msgstr "" msgid "Washington, District of Columbia, United States" msgstr "" -#: resources/views/admin/trees-preferences.phtml:345 +#: resources/views/admin/trees-preferences.phtml:325 msgid "Watermarks" msgstr "" #. I18N: Help text for the “Images without watermarks” configuration setting -#: resources/views/admin/trees-preferences.phtml:355 +#: resources/views/admin/trees-preferences.phtml:335 msgid "Watermarks are optional and normally shown just to visitors." msgstr "" @@ -15623,16 +15654,16 @@ msgstr "" #: resources/views/admin/control-panel.phtml:24 #: resources/views/admin/control-panel.phtml:352 -#: resources/views/admin/trees-preferences.phtml:203 +#: resources/views/admin/trees-preferences.phtml:183 msgid "Website" msgstr "" -#: app/Http/Controllers/AdminSiteController.php:193 +#: app/Http/Controllers/AdminSiteController.php:196 #: resources/views/admin/control-panel.phtml:85 msgid "Website logs" msgstr "" -#: app/Http/Controllers/AdminSiteController.php:416 +#: app/Http/Controllers/AdminSiteController.php:417 #: resources/views/admin/control-panel.phtml:63 msgid "Website preferences" msgstr "" @@ -15663,7 +15694,7 @@ msgstr "" msgid "Welcome text on sign-in page" msgstr "" -#: resources/views/login-page.phtml:11 +#: resources/views/login-page.phtml:22 msgid "Welcome to this genealogy website" msgstr "" @@ -15673,7 +15704,7 @@ msgid "Western Sahara" msgstr "" #. I18N: Help text for the “Keep the existing ‘last change’ information” configuration setting -#: resources/views/admin/trees-preferences.phtml:968 +#: resources/views/admin/trees-preferences.phtml:948 msgid "When a record is edited, the user and timestamp are recorded. Sometimes it is desirable to keep the existing “last change” information, for example when making minor corrections to someone else’s data. This option controls whether this feature is selected by default." msgstr "" @@ -15682,12 +15713,12 @@ msgid "When a user registers for an account, an email is sent to their email add msgstr "" #. I18N: Help text for the “Source type” configuration setting -#: resources/views/admin/trees-preferences.phtml:953 +#: resources/views/admin/trees-preferences.phtml:933 msgid "When adding new close relatives, you can add source citations to the records (individual and family) or to the facts and events (birth, marriage, and death). This option controls whether records or facts will be selected by default." msgstr "" #. I18N: Help text for the “Surname tradition” configuration setting -#: resources/views/admin/trees-preferences.phtml:923 +#: resources/views/admin/trees-preferences.phtml:903 msgid "When you add a new family member, a default surname can be provided. This surname will depend on the local tradition." msgstr "" @@ -15705,7 +15736,7 @@ msgid "Which family trees should be included in the sitemaps" msgstr "" #. I18N: A configuration setting -#: resources/views/admin/trees-preferences.phtml:288 +#: resources/views/admin/trees-preferences.phtml:268 msgid "Who can upload new media files" msgstr "" @@ -15829,8 +15860,8 @@ msgstr "" msgid "You (or someone claiming to be you) has requested an account at %1$s using the email address %2$s." msgstr "" -#: app/Http/Controllers/Auth/RegisterController.php:219 -#: app/Http/Controllers/MessageController.php:221 +#: app/Http/Controllers/Auth/RegisterController.php:227 +#: app/Http/Controllers/MessageController.php:228 msgid "You are not allowed to send messages that contain external links." msgstr "" @@ -15845,15 +15876,13 @@ msgstr "" #. I18N: Help text for the "Default theme" site configuration setting #. I18N: Help text for the “Default theme” configuration setting -#. I18N: Help text for the "Default theme" site configuration setting #: resources/views/admin/site-preferences.phtml:59 -#: resources/views/admin/trees-preferences.phtml:254 -#: resources/views/edit-account-page.phtml:122 +#: resources/views/admin/trees-preferences.phtml:234 msgid "You can change the appearance of webtrees using “themes”. Each theme has a different style, layout, color scheme, etc." msgstr "" #: resources/views/admin/users-edit.phtml:162 -#: resources/views/edit-account-page.phtml:148 +#: resources/views/edit-account-page.phtml:133 msgid "You can choose whether to appear in the list of users who are currently signed-in." msgstr "" @@ -15905,7 +15934,7 @@ msgstr "" msgid "You may use HTML to format the answer and to add links to other websites." msgstr "" -#: resources/views/admin/site-mail.phtml:10 +#: resources/views/admin/site-mail.phtml:31 msgid "You must also enable “less secure applications” in your Google account." msgstr "" @@ -15933,7 +15962,7 @@ msgstr "" msgid "You need to be an authorized user to access this website." msgstr "" -#: resources/views/admin/trees.phtml:15 +#: resources/views/admin/trees.phtml:19 msgid "You need to create a family tree." msgstr "" @@ -15956,8 +15985,8 @@ msgid "You should accept or reject all pending changes before upgrading." msgstr "" #. I18N: e.g. ‘You should delete the “http://” from “http://www.example.com” and try again.’ -#: app/Http/Controllers/Auth/RegisterController.php:219 -#: app/Http/Controllers/MessageController.php:222 +#: app/Http/Controllers/Auth/RegisterController.php:227 +#: app/Http/Controllers/MessageController.php:229 #, php-format msgid "You should delete the “%1$s” from “%2$s” and try again." msgstr "" @@ -16000,7 +16029,11 @@ msgstr "" msgid "Your name" msgstr "" -#: app/Http/Controllers/Auth/RegisterController.php:141 +#: app/Http/RequestHandlers/PasswordResetAction.php:71 +msgid "Your password has been updated." +msgstr "" + +#: app/Http/Controllers/Auth/RegisterController.php:151 #, php-format msgid "Your registration at %s" msgstr "" @@ -16009,7 +16042,7 @@ msgstr "" msgid "Your user account does not have “automatically accept changes” enabled. You will only be able to change one record at a time." msgstr "" -#: app/Services/ServerCheckService.php:184 +#: app/Services/ServerCheckService.php:195 #, php-format msgid "Your web server is using PHP version %s, which is no longer receiving security updates. You should upgrade to a later version as soon as possible." msgstr "" @@ -16024,12 +16057,12 @@ msgstr "" msgid "Zimbabwe" msgstr "" -#: resources/views/admin/location-edit.phtml:62 +#: resources/views/admin/location-edit.phtml:63 #: resources/views/modules/fanchart/page.phtml:43 msgid "Zoom" msgstr "" -#: resources/views/admin/location-edit.phtml:131 +#: resources/views/admin/location-edit.phtml:132 #: resources/views/modules/pedigree-map/chart.phtml:53 #: resources/views/modules/places/tab.phtml:49 #: resources/views/modules/timeline-chart/page.phtml:41 @@ -16041,7 +16074,7 @@ msgstr "" msgid "Zoom level" msgstr "" -#: resources/views/admin/location-edit.phtml:132 +#: resources/views/admin/location-edit.phtml:133 #: resources/views/modules/pedigree-map/chart.phtml:54 #: resources/views/modules/places/tab.phtml:50 #: resources/views/modules/timeline-chart/page.phtml:44 @@ -16058,7 +16091,7 @@ msgstr "" #. I18N: %1$s is “accept”, %2$s is “reject”. These are links. #: resources/views/family-page.phtml:19 #: resources/views/gedcom-record-page.phtml:14 -#: resources/views/individual-page.phtml:19 resources/views/media-page.phtml:15 +#: resources/views/individual-page.phtml:34 resources/views/media-page.phtml:30 #: resources/views/note-page.phtml:14 resources/views/repository-page.phtml:18 #: resources/views/source-page.phtml:14 msgctxt "You should review the changes and then accept or reject them." @@ -16068,7 +16101,7 @@ msgstr "" #. I18N: %1$s is “accept”, %2$s is “reject”. These are links. #: resources/views/family-page.phtml:13 #: resources/views/gedcom-record-page.phtml:8 -#: resources/views/individual-page.phtml:10 resources/views/media-page.phtml:9 +#: resources/views/individual-page.phtml:25 resources/views/media-page.phtml:24 #: resources/views/note-page.phtml:8 resources/views/repository-page.phtml:12 #: resources/views/source-page.phtml:8 msgctxt "You should review the deletion and then accept or reject it." @@ -16132,8 +16165,8 @@ msgstr "" msgid "after death" msgstr "" -#: app/Http/Controllers/IndividualController.php:95 -#: app/Http/Controllers/IndividualController.php:98 +#: app/Http/Controllers/IndividualController.php:96 +#: app/Http/Controllers/IndividualController.php:99 #: app/Module/StatisticsChartModule.php:517 #: app/Module/StatisticsChartModule.php:579 #: app/Module/StatisticsChartModule.php:640 @@ -16157,7 +16190,7 @@ msgctxt "MALE" msgid "also known as" msgstr "" -#: app/Functions/FunctionsEdit.php:569 +#: app/Functions/FunctionsEdit.php:554 msgid "always" msgstr "" @@ -16365,11 +16398,11 @@ msgstr "" #: resources/views/admin/analytics-edit.phtml:31 #: resources/views/admin/broadcast.phtml:56 #: resources/views/admin/components.phtml:137 -#: resources/views/admin/location-edit.phtml:78 -#: resources/views/admin/site-mail.phtml:146 +#: resources/views/admin/location-edit.phtml:79 +#: resources/views/admin/site-mail.phtml:222 #: resources/views/admin/site-preferences.phtml:93 #: resources/views/admin/site-registration.phtml:76 -#: resources/views/admin/trees-preferences.phtml:982 +#: resources/views/admin/trees-preferences.phtml:962 #: resources/views/admin/trees-privacy.phtml:280 #: resources/views/contact-page.phtml:62 #: resources/views/edit-blocks-page.phtml:49 @@ -16462,20 +16495,22 @@ msgstr "" #: resources/views/admin/trees-import.phtml:111 #: resources/views/admin/trees-merge.phtml:41 #: resources/views/admin/trees-renumber.phtml:29 -#: resources/views/admin/trees.phtml:382 +#: resources/views/admin/trees.phtml:392 #: resources/views/admin/upgrade/wizard.phtml:28 -#: resources/views/forgot-password-page.phtml:25 +#: resources/views/forgot-password-page.phtml:33 #: resources/views/modules/clippings/add-options.phtml:22 #: resources/views/modules/login_block/sign-in.phtml:52 +#: resources/views/password-request-page.phtml:31 +#: resources/views/password-reset-page.phtml:49 #: resources/views/pending-changes-page.phtml:14 -#: resources/views/register-page.phtml:83 +#: resources/views/register-page.phtml:97 #: resources/views/report-select-page.phtml:29 #: resources/views/report-setup-page.phtml:56 msgid "continue" msgstr "" #. I18N: A button label. -#: resources/views/admin/trees.phtml:348 +#: resources/views/admin/trees.phtml:357 msgid "create" msgstr "" @@ -16520,8 +16555,8 @@ msgstr "" msgid "death" msgstr "" -#: resources/views/admin/location-edit.phtml:46 -#: resources/views/admin/location-edit.phtml:57 +#: resources/views/admin/location-edit.phtml:47 +#: resources/views/admin/location-edit.phtml:58 msgid "degrees" msgstr "" @@ -16745,7 +16780,7 @@ msgid "fifth cousin" msgstr "" #. I18N: A button label, first page -#: resources/views/admin/trees-preferences.phtml:607 +#: resources/views/admin/trees-preferences.phtml:587 #: resources/views/lists/datatables-attributes.phtml:10 #: resources/views/media-list-page.phtml:80 #: resources/views/media-list-page.phtml:186 @@ -16753,7 +16788,7 @@ msgid "first" msgstr "" #. I18N: The placeholders are edit controls. Show the [first/last] [1/2/3/4/5] parts of a place name -#: resources/views/admin/trees-preferences.phtml:615 +#: resources/views/admin/trees-preferences.phtml:595 msgctxt "Show the [first/last] [N] parts of a place name." msgid "first" msgstr "" @@ -18582,17 +18617,17 @@ msgid "herself" msgstr "ตัวเธอเอง" #. I18N: Examples of valid time formats (hours:minutes:seconds) -#: app/Functions/FunctionsEdit.php:565 +#: app/Functions/FunctionsEdit.php:550 msgid "hh:mm or hh:mm:ss" msgstr "" -#: resources/views/admin/trees-preferences.phtml:322 -#: resources/views/admin/trees-preferences.phtml:402 -#: resources/views/admin/trees-preferences.phtml:417 -#: resources/views/admin/trees-preferences.phtml:433 -#: resources/views/admin/trees-preferences.phtml:558 -#: resources/views/admin/trees-preferences.phtml:669 -#: resources/views/admin/trees-preferences.phtml:684 +#: resources/views/admin/trees-preferences.phtml:302 +#: resources/views/admin/trees-preferences.phtml:382 +#: resources/views/admin/trees-preferences.phtml:397 +#: resources/views/admin/trees-preferences.phtml:413 +#: resources/views/admin/trees-preferences.phtml:538 +#: resources/views/admin/trees-preferences.phtml:649 +#: resources/views/admin/trees-preferences.phtml:664 msgid "hide" msgstr "" @@ -18668,14 +18703,14 @@ msgid "jours complementaires" msgstr "" #. I18N: A button label, last page -#: resources/views/admin/trees-preferences.phtml:607 +#: resources/views/admin/trees-preferences.phtml:587 #: resources/views/lists/datatables-attributes.phtml:12 #: resources/views/media-list-page.phtml:104 #: resources/views/media-list-page.phtml:210 msgid "last" msgstr "" -#: resources/views/admin/trees-preferences.phtml:615 +#: resources/views/admin/trees-preferences.phtml:595 msgctxt "Show the [first/last] [N] parts of a place name." msgid "last" msgstr "" @@ -18914,12 +18949,12 @@ msgctxt "wife’s sister’s child" msgid "nephew/niece" msgstr "" -#: app/Functions/FunctionsEdit.php:569 +#: app/Functions/FunctionsEdit.php:554 msgid "never" msgstr "" #. I18N: A button label, next page -#: resources/views/individual-page.phtml:59 +#: resources/views/individual-page.phtml:74 #: resources/views/lists/datatables-attributes.phtml:14 #: resources/views/media-list-page.phtml:97 #: resources/views/media-list-page.phtml:203 @@ -18928,10 +18963,10 @@ msgstr "" #: resources/views/setup/step-1-language.phtml:36 #: resources/views/setup/step-2-server-checks.phtml:64 #: resources/views/setup/step-3-database-type.phtml:72 -#: resources/views/setup/step-4-database-mysql.phtml:115 -#: resources/views/setup/step-4-database-pgsql.phtml:102 +#: resources/views/setup/step-4-database-mysql.phtml:111 +#: resources/views/setup/step-4-database-pgsql.phtml:98 #: resources/views/setup/step-4-database-sqlite.phtml:72 -#: resources/views/setup/step-4-database-sqlsvr.phtml:101 +#: resources/views/setup/step-4-database-sqlsvr.phtml:98 #: resources/views/setup/step-5-administrator.phtml:82 msgid "next" msgstr "" @@ -19011,23 +19046,23 @@ msgctxt "MALE" msgid "ninth cousin" msgstr "" -#: app/Functions/FunctionsEdit.php:146 app/Functions/FunctionsEdit.php:195 -#: app/Http/Controllers/Admin/UsersController.php:249 -#: app/Http/Controllers/Admin/UsersController.php:250 +#: app/Functions/FunctionsEdit.php:146 app/Functions/FunctionsEdit.php:180 +#: app/Http/Controllers/Admin/UsersController.php:257 +#: app/Http/Controllers/Admin/UsersController.php:258 #: app/Module/BatchUpdate/BatchUpdateSearchReplacePlugin.php:207 #: app/Statistics/Repository/LatestUserRepository.php:134 #: resources/views/admin/map-import-form.phtml:56 -#: resources/views/admin/site-mail.phtml:77 +#: resources/views/admin/site-mail.phtml:108 #: resources/views/admin/site-preferences.phtml:75 #: resources/views/admin/site-registration.phtml:43 #: resources/views/admin/site-registration.phtml:60 -#: resources/views/admin/trees-preferences.phtml:132 -#: resources/views/admin/trees-preferences.phtml:337 -#: resources/views/admin/trees-preferences.phtml:573 -#: resources/views/admin/trees-preferences.phtml:589 -#: resources/views/admin/trees-preferences.phtml:654 -#: resources/views/admin/trees-preferences.phtml:936 -#: resources/views/admin/trees-preferences.phtml:966 +#: resources/views/admin/trees-preferences.phtml:133 +#: resources/views/admin/trees-preferences.phtml:317 +#: resources/views/admin/trees-preferences.phtml:553 +#: resources/views/admin/trees-preferences.phtml:569 +#: resources/views/admin/trees-preferences.phtml:634 +#: resources/views/admin/trees-preferences.phtml:916 +#: resources/views/admin/trees-preferences.phtml:946 #: resources/views/lists/families-table.phtml:378 #: resources/views/modules/html/config.phtml:44 #: resources/views/modules/random_media/config.phtml:34 @@ -19050,10 +19085,9 @@ msgid "no" msgstr "" #. I18N: None of the other options -#: app/Http/Controllers/AdminSiteController.php:354 #: app/Http/Controllers/AdminTreesController.php:1013 #: app/Http/Controllers/AdminTreesController.php:1019 -#: app/Module/RelationshipsChartModule.php:164 +#: app/Module/RelationshipsChartModule.php:164 app/Services/MailService.php:214 #: resources/views/modules/statistics-chart/custom.phtml:71 msgid "none" msgstr "" @@ -19145,7 +19179,7 @@ msgid "preview" msgstr "" #. I18N: A button label, previous page -#: resources/views/individual-page.phtml:55 +#: resources/views/individual-page.phtml:70 #: resources/views/lists/datatables-attributes.phtml:16 #: resources/views/media-list-page.phtml:87 #: resources/views/media-list-page.phtml:193 @@ -19153,10 +19187,10 @@ msgstr "" #: resources/views/modules/batch_update/admin.phtml:61 #: resources/views/setup/step-2-server-checks.phtml:68 #: resources/views/setup/step-3-database-type.phtml:76 -#: resources/views/setup/step-4-database-mysql.phtml:119 -#: resources/views/setup/step-4-database-pgsql.phtml:106 +#: resources/views/setup/step-4-database-mysql.phtml:115 +#: resources/views/setup/step-4-database-pgsql.phtml:102 #: resources/views/setup/step-4-database-sqlite.phtml:76 -#: resources/views/setup/step-4-database-sqlsvr.phtml:105 +#: resources/views/setup/step-4-database-sqlsvr.phtml:102 #: resources/views/setup/step-5-administrator.phtml:86 msgid "previous" msgstr "" @@ -19178,7 +19212,7 @@ msgstr "" #: resources/views/family-page.phtml:19 #: resources/views/gedcom-record-page.phtml:14 -#: resources/views/individual-page.phtml:19 resources/views/media-page.phtml:15 +#: resources/views/individual-page.phtml:34 resources/views/media-page.phtml:30 #: resources/views/note-page.phtml:14 resources/views/repository-page.phtml:18 #: resources/views/source-page.phtml:14 msgctxt "You should review the changes and then accept or reject them." @@ -19187,7 +19221,7 @@ msgstr "" #: resources/views/family-page.phtml:13 #: resources/views/gedcom-record-page.phtml:8 -#: resources/views/individual-page.phtml:10 resources/views/media-page.phtml:9 +#: resources/views/individual-page.phtml:25 resources/views/media-page.phtml:24 #: resources/views/note-page.phtml:8 resources/views/repository-page.phtml:12 #: resources/views/source-page.phtml:8 msgctxt "You should review the deletion and then accept or reject it." @@ -19235,18 +19269,18 @@ msgstr "" #. I18N: A button label. #: resources/views/admin/analytics-edit.phtml:26 #: resources/views/admin/components.phtml:132 -#: resources/views/admin/location-edit.phtml:74 +#: resources/views/admin/location-edit.phtml:75 #: resources/views/admin/map-provider.phtml:51 #: resources/views/admin/merge-records-step-2.phtml:155 #: resources/views/admin/modules.phtml:263 -#: resources/views/admin/site-mail.phtml:141 +#: resources/views/admin/site-mail.phtml:217 #: resources/views/admin/site-preferences.phtml:88 #: resources/views/admin/site-registration.phtml:71 -#: resources/views/admin/trees-preferences.phtml:978 +#: resources/views/admin/trees-preferences.phtml:958 #: resources/views/admin/trees-privacy.phtml:276 #: resources/views/admin/users-create.phtml:66 #: resources/views/admin/users-edit.phtml:334 -#: resources/views/edit-account-page.phtml:157 +#: resources/views/edit-account-page.phtml:142 #: resources/views/edit-blocks-page.phtml:44 #: resources/views/edit/add-fact.phtml:83 #: resources/views/edit/change-family-members.phtml:74 @@ -19492,13 +19526,13 @@ msgctxt "MALE" msgid "seventh cousin" msgstr "" -#: resources/views/admin/trees-preferences.phtml:322 -#: resources/views/admin/trees-preferences.phtml:402 -#: resources/views/admin/trees-preferences.phtml:417 -#: resources/views/admin/trees-preferences.phtml:433 -#: resources/views/admin/trees-preferences.phtml:558 -#: resources/views/admin/trees-preferences.phtml:669 -#: resources/views/admin/trees-preferences.phtml:684 +#: resources/views/admin/trees-preferences.phtml:302 +#: resources/views/admin/trees-preferences.phtml:382 +#: resources/views/admin/trees-preferences.phtml:397 +#: resources/views/admin/trees-preferences.phtml:413 +#: resources/views/admin/trees-preferences.phtml:538 +#: resources/views/admin/trees-preferences.phtml:649 +#: resources/views/admin/trees-preferences.phtml:664 #: resources/views/modules/faq/config.phtml:22 #: resources/views/modules/stories/config.phtml:18 msgid "show" @@ -19513,7 +19547,7 @@ msgid "sibling" msgstr "" #. I18N: A button label. -#: resources/views/login-page.phtml:45 +#: resources/views/login-page.phtml:57 #: resources/views/modules/login_block/sign-in.phtml:24 msgid "sign in" msgstr "ลงชื่อเข้าใช้" @@ -19683,7 +19717,7 @@ msgid "spouse" msgstr "" #. I18N: Secure Sockets Layer - a secure communications protocol -#: app/Http/Controllers/AdminSiteController.php:356 +#: app/Services/MailService.php:216 msgid "ssl" msgstr "" @@ -19895,7 +19929,7 @@ msgid "three-quarter circle" msgstr "" #. I18N: Transport Layer Security - a secure communications protocol -#: app/Http/Controllers/AdminSiteController.php:358 +#: app/Services/MailService.php:218 msgid "tls" msgstr "" @@ -20007,7 +20041,7 @@ msgstr "" #: resources/views/modules/interactive-tree/page.phtml:31 #: resources/views/modules/pedigree-chart/page.phtml:43 #: resources/views/modules/pedigree-map/page.phtml:34 -#: resources/views/modules/relationships-chart/page.phtml:70 +#: resources/views/modules/relationships-chart/page.phtml:66 msgid "view" msgstr "" @@ -20035,7 +20069,7 @@ msgstr "" msgid "webtrees" msgstr "" -#: app/Http/Controllers/MessageController.php:417 +#: app/Http/Controllers/MessageController.php:423 msgid "webtrees message" msgstr "" @@ -20044,13 +20078,8 @@ msgid "webtrees needs a database to store your genealogy data." msgstr "" #. I18N: Help text for the “Messages” site configuration setting -#: resources/views/admin/site-mail.phtml:24 -msgid "webtrees needs to send emails, such as password reminders and website notifications. To do this, it can use this server’s built in PHP mail facility (which is not always available) or an external SMTP (mail-relay) service, for which you will need to provide the connection details." -msgstr "" - -#. I18N: A configuration setting -#: resources/views/admin/trees-preferences.phtml:145 -msgid "webtrees reply address" +#: resources/views/admin/site-mail.phtml:46 +msgid "webtrees needs to send emails, such as password reminders and website notifications." msgstr "" #: app/Functions/FunctionsEdit.php:132 @@ -20074,23 +20103,23 @@ msgstr "" msgid "years" msgstr "ปี" -#: app/Functions/FunctionsEdit.php:147 app/Functions/FunctionsEdit.php:196 -#: app/Http/Controllers/Admin/UsersController.php:249 -#: app/Http/Controllers/Admin/UsersController.php:250 +#: app/Functions/FunctionsEdit.php:147 app/Functions/FunctionsEdit.php:181 +#: app/Http/Controllers/Admin/UsersController.php:257 +#: app/Http/Controllers/Admin/UsersController.php:258 #: app/Module/BatchUpdate/BatchUpdateSearchReplacePlugin.php:208 #: app/Statistics/Repository/LatestUserRepository.php:133 #: resources/views/admin/map-import-form.phtml:56 -#: resources/views/admin/site-mail.phtml:77 +#: resources/views/admin/site-mail.phtml:108 #: resources/views/admin/site-preferences.phtml:75 #: resources/views/admin/site-registration.phtml:43 #: resources/views/admin/site-registration.phtml:60 -#: resources/views/admin/trees-preferences.phtml:132 -#: resources/views/admin/trees-preferences.phtml:337 -#: resources/views/admin/trees-preferences.phtml:573 -#: resources/views/admin/trees-preferences.phtml:589 -#: resources/views/admin/trees-preferences.phtml:654 -#: resources/views/admin/trees-preferences.phtml:936 -#: resources/views/admin/trees-preferences.phtml:966 +#: resources/views/admin/trees-preferences.phtml:133 +#: resources/views/admin/trees-preferences.phtml:317 +#: resources/views/admin/trees-preferences.phtml:553 +#: resources/views/admin/trees-preferences.phtml:569 +#: resources/views/admin/trees-preferences.phtml:634 +#: resources/views/admin/trees-preferences.phtml:916 +#: resources/views/admin/trees-preferences.phtml:946 #: resources/views/lists/families-table.phtml:380 #: resources/views/modules/html/config.phtml:44 #: resources/views/modules/random_media/config.phtml:34 |