From 4da7295d26640d23f9b7882b85340ec5b8f2e19b Mon Sep 17 00:00:00 2001 From: Andrei Kurosh Date: Sun, 21 Apr 2024 18:01:58 +0200 Subject: [PATCH] English translation for strings. Various fixes. --- .../Areas/Admin/Controllers/HelpController.cs | 4 +- .../Admin/Views/Changesets/Details.cshtml | 2 +- .../Areas/Admin/Views/Changesets/Index.cshtml | 2 +- .../Admin/Views/Changesets/Revert.cshtml | 2 +- .../Admin/Views/DynamicConfig/Index.cshtml | 2 +- .../Areas/Admin/Views/Users/Create.cshtml | 2 +- .../Admin/Views/Users/ResetPassword.cshtml | 2 +- .../Areas/Admin/Views/Users/Update.cshtml | 2 +- src/Bonsai/Areas/Common/Libs/gijgo.core.js | 66 - .../Front/Views/Auth/RegisterForm.cshtml | 2 +- .../Areas/Front/Views/Page/Media.cshtml | 2 +- src/Bonsai/Areas/Front/Views/Tree/Main.cshtml | 2 +- src/Bonsai/Bonsai.csproj | 3 + src/Bonsai/Code/Utils/Date/FuzzyDate.cs | 2 +- src/Bonsai/Localization/Texts.Designer.cs | 78 +- src/Bonsai/Localization/Texts.en-us.resx | 2206 +++++++++++++++++ src/Bonsai/Localization/Texts.resx | 28 +- 17 files changed, 2239 insertions(+), 168 deletions(-) create mode 100644 src/Bonsai/Localization/Texts.en-us.resx diff --git a/src/Bonsai/Areas/Admin/Controllers/HelpController.cs b/src/Bonsai/Areas/Admin/Controllers/HelpController.cs index db153a60..d05cce64 100644 --- a/src/Bonsai/Areas/Admin/Controllers/HelpController.cs +++ b/src/Bonsai/Areas/Admin/Controllers/HelpController.cs @@ -15,7 +15,7 @@ public class HelpController: AdminControllerBase [Route("markdown")] public ActionResult Markdown() { - return View("Markdown" + LocaleProvider.GetLocaleCode()); + return View("Markdown." + LocaleProvider.GetLocaleCode()); } /// @@ -24,7 +24,7 @@ public ActionResult Markdown() [Route("guidelines")] public ActionResult Guidelines() { - return View("Guidelines" + LocaleProvider.GetLocaleCode()); + return View("Guidelines." + LocaleProvider.GetLocaleCode()); } } } diff --git a/src/Bonsai/Areas/Admin/Views/Changesets/Details.cshtml b/src/Bonsai/Areas/Admin/Views/Changesets/Details.cshtml index 998af63c..ae31066e 100644 --- a/src/Bonsai/Areas/Admin/Views/Changesets/Details.cshtml +++ b/src/Bonsai/Areas/Admin/Views/Changesets/Details.cshtml @@ -50,7 +50,7 @@ @if (Model.CanRevert) { - @Texts.Admin_Changesets_Details_Revert + @Texts.Admin_Changesets_Revert } @if (Model.EntityExists) diff --git a/src/Bonsai/Areas/Admin/Views/Changesets/Index.cshtml b/src/Bonsai/Areas/Admin/Views/Changesets/Index.cshtml index 62be2e00..a4aa51fc 100644 --- a/src/Bonsai/Areas/Admin/Views/Changesets/Index.cshtml +++ b/src/Bonsai/Areas/Admin/Views/Changesets/Index.cshtml @@ -113,7 +113,7 @@ @if (c.CanRevert) { - + } @if (c.EntityExists) diff --git a/src/Bonsai/Areas/Admin/Views/Changesets/Revert.cshtml b/src/Bonsai/Areas/Admin/Views/Changesets/Revert.cshtml index 540528d5..26dcae0b 100644 --- a/src/Bonsai/Areas/Admin/Views/Changesets/Revert.cshtml +++ b/src/Bonsai/Areas/Admin/Views/Changesets/Revert.cshtml @@ -70,6 +70,6 @@ else
- + @Texts.Admin_Global_Cancel
\ No newline at end of file diff --git a/src/Bonsai/Areas/Admin/Views/DynamicConfig/Index.cshtml b/src/Bonsai/Areas/Admin/Views/DynamicConfig/Index.cshtml index 552a10ca..5de43e8f 100644 --- a/src/Bonsai/Areas/Admin/Views/DynamicConfig/Index.cshtml +++ b/src/Bonsai/Areas/Admin/Views/DynamicConfig/Index.cshtml @@ -102,7 +102,7 @@ @if (!ViewData.ModelState.IsValid) { - + }
diff --git a/src/Bonsai/Areas/Admin/Views/Users/Create.cshtml b/src/Bonsai/Areas/Admin/Views/Users/Create.cshtml index a692f732..67073231 100644 --- a/src/Bonsai/Areas/Admin/Views/Users/Create.cshtml +++ b/src/Bonsai/Areas/Admin/Views/Users/Create.cshtml @@ -104,7 +104,7 @@ @if (!ViewData.ModelState.IsValid) { - + }
diff --git a/src/Bonsai/Areas/Admin/Views/Users/ResetPassword.cshtml b/src/Bonsai/Areas/Admin/Views/Users/ResetPassword.cshtml index 49994461..46255708 100644 --- a/src/Bonsai/Areas/Admin/Views/Users/ResetPassword.cshtml +++ b/src/Bonsai/Areas/Admin/Views/Users/ResetPassword.cshtml @@ -43,7 +43,7 @@ @if (!ViewData.ModelState.IsValid) { } diff --git a/src/Bonsai/Areas/Admin/Views/Users/Update.cshtml b/src/Bonsai/Areas/Admin/Views/Users/Update.cshtml index 08334707..d491e3ff 100644 --- a/src/Bonsai/Areas/Admin/Views/Users/Update.cshtml +++ b/src/Bonsai/Areas/Admin/Views/Users/Update.cshtml @@ -106,7 +106,7 @@ @if(!ViewData.ModelState.IsValid) { - + }
diff --git a/src/Bonsai/Areas/Common/Libs/gijgo.core.js b/src/Bonsai/Areas/Common/Libs/gijgo.core.js index 37939a4d..b518e0db 100644 --- a/src/Bonsai/Areas/Common/Libs/gijgo.core.js +++ b/src/Bonsai/Areas/Common/Libs/gijgo.core.js @@ -658,28 +658,6 @@ gj.picker.widget.prototype.destroy = function (type) { } return this; }; -gj.core.messages['bg-bg'] = { - monthNames: ['Януари', 'Февруари', 'Март', 'Април', 'Май', 'Юни', 'Юли', 'Август', 'Септември', 'Октомври', 'Ноември', 'Декември'], - monthShortNames: ['Яну', 'Фев', 'Мар', 'Апр', 'Май', 'Юни', 'Юли', 'Авг', 'Сеп', 'ОКт', 'Ное', 'Дек'], - weekDaysMin: ['Н', 'П', 'В', 'С', 'Ч', 'П', 'С'], - weekDaysShort: ['Нед', 'Пон', 'Вто', 'Сря', 'Чет', 'Пет', 'Съб'], - weekDays: ['Неделя', 'Понеделник', 'Вторник', 'Сряда', 'Четвъртък', 'Петък', 'Събота'], - am: 'AM', - pm: 'PM', - ok: 'ОК', - cancel: 'Отказ' -}; -gj.core.messages['fr-fr'] = { - monthNames: ['janvier', 'février', 'mars', 'avril', 'mai', 'juin', 'juillet', 'août', 'septembre', 'octobre', 'novembre', 'décembre'], - monthShortNames: ['janv.', 'févr.', 'mars', 'avr.', 'mai', 'juin', 'juil.', 'août', 'sept.', 'oct.', 'nov.', 'déc.'], - weekDaysMin: ['D', 'L', 'M', 'M', 'J', 'V', 'S'], - weekDaysShort: ['dim.', 'lun.', 'mar.', 'mer.', 'jeu.', 'ven.', 'sam.'], - weekDays: ['dimanche', 'lundi', 'mardi', 'mercredi', 'jeudi', 'vendredi', 'samedi'], - am: 'AM', - pm: 'PM', - ok: 'OK', - cancel: 'Annuler' -}; gj.core.messages['de-de'] = { monthNames: ['Januar', 'Februar', 'März', 'April', 'Mai', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'Dezember'], monthShortNames: ['Jan', 'Feb', 'Mär', 'Apr', 'Mai', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dez'], @@ -691,17 +669,6 @@ gj.core.messages['de-de'] = { ok: 'OK', cancel: 'Abbrechen' }; -gj.core.messages['pt-br'] = { - monthNames: ['Janeiro', 'Fevereiro', 'Março', 'Abril', 'Maio', 'Junho', 'Julho', 'Agosto', 'Setembro', 'Outubro', 'Novembro', 'Dezembro'], - monthShortNames: ['Jan', 'Fev', 'Mar', 'Abr', 'Mai', 'Jun', 'Jul', 'Ago', 'Set', 'Out', 'Nov', 'Dez'], - weekDaysMin: ['D', 'S', 'T', 'Q', 'Q', 'S', 'S'], - weekDaysShort: ['Dom', 'Seg', 'Ter', 'Qua', 'Qui', 'Sex', 'Sáb'], - weekDays: ['Domingo', 'Segunda-feira', 'Terça-feira', 'Quarta-feira', 'Quinta-feira', 'Sexta-feira', 'Sábado'], - am: 'AM', - pm: 'PM', - ok: 'OK', - cancel: 'Cancelar' -}; gj.core.messages['ru-ru'] = { monthNames: ['Январь', 'Февраль', 'Март', 'Апрель', 'Май', 'Июнь', 'Июль', 'Август', 'Сентябрь', 'Октябрь', 'Ноябрь', 'Декабрь'], monthShortNames: ['Янв', 'Фев', 'Мар', 'Апр', 'Май', 'Июн', 'Июл', 'Авг', 'Сен', 'Окт', 'Ноя', 'Дек'], @@ -713,36 +680,3 @@ gj.core.messages['ru-ru'] = { ok: 'ОК', cancel: 'Отмена' }; -gj.core.messages['es-es'] = { - monthNames: ['enero', 'febrero', 'marzo', 'abril', 'mayo', 'junio', 'julio', 'agosto', 'setiembre', 'octubre', 'noviembre', 'diciembre'], - monthShortNames: ['ene.', 'feb.', 'mar', 'abr.', 'may', 'jun', 'jul.', 'ago', 'set.', 'oct.', 'nov.', 'dic.'], - weekDaysMin: ['D', 'L', 'M', 'M', 'J', 'V', 'S'], - weekDaysShort: ['dom', 'lun', 'mar', 'mié', 'jue', 'vie', 'sáb'], - weekDays: ['domingo', 'lunes', 'martes', 'miércoles', 'jueves', 'viernes', 'sábado'], - am: 'AM', - pm: 'PM', - ok: 'OK', - cancel: 'Cancelar' -}; -gj.core.messages['it-it'] = { - monthNames: ['gennaio', 'febbraio', 'marzo', 'aprile', 'maggio', 'giugno', 'luglio', 'agosto', 'settembre', 'ottobre', 'novembre', 'dicembre'], - monthShortNames: ['gen.', 'feb.', 'mar.', 'apr.', 'mag.', 'giu.', 'lug.', 'ago.', 'set.', 'ott.', 'nov.', 'dic.'], - weekDaysMin: ['Do', 'Lu', 'Ma', 'Me', 'Gi', 'Ve', 'Sa'], - weekDaysShort: ['Dom', 'Lun', 'Mar', 'Mer', 'Gio', 'Ven','Sab'], - weekDays: ['Domenica', 'Lunedì', 'Martedì', 'Mercoledì', 'Giovedì', 'Venerdì', 'Sabato'], - am: 'AM', - pm: 'PM', - ok: 'OK', - cancel: 'Annulla' -}; -gj.core.messages['tr-tr'] = { - monthNames: ['ocak', 'şubat', 'mart', 'nisan', 'mayıs', 'haziran', 'temmuz', 'ağustos', 'eylül', 'ekim', 'kasım', 'aralık'], - monthShortNames: ['oca', 'şub', 'mar', 'nis', 'may', 'haz', 'tem', 'ağu', 'eyl', 'eki', 'kas', 'ara'], - weekDaysMin: ['P', 'S', 'Ç', 'P', 'C', 'C', 'P'], - weekDaysShort: ['pzt.', 'sl.', 'çar.', 'per.', 'cum.', 'cmt.', 'paz.'], - weekDays: ['pazartesi', 'salı', 'çarşamba', 'perşembe', 'cuma', 'cumartesi', 'pazar'], - am: 'AM', - pm: 'PM', - ok: 'Tamam', - cancel: 'İptal' -}; diff --git a/src/Bonsai/Areas/Front/Views/Auth/RegisterForm.cshtml b/src/Bonsai/Areas/Front/Views/Auth/RegisterForm.cshtml index 135a30d7..4350ca53 100644 --- a/src/Bonsai/Areas/Front/Views/Auth/RegisterForm.cshtml +++ b/src/Bonsai/Areas/Front/Views/Auth/RegisterForm.cshtml @@ -102,7 +102,7 @@ @if (!ViewData.ModelState.IsValid) { } diff --git a/src/Bonsai/Areas/Front/Views/Page/Media.cshtml b/src/Bonsai/Areas/Front/Views/Page/Media.cshtml index 58250f70..f218057b 100644 --- a/src/Bonsai/Areas/Front/Views/Page/Media.cshtml +++ b/src/Bonsai/Areas/Front/Views/Page/Media.cshtml @@ -6,7 +6,7 @@ Layout = "~/Areas/Front/Views/Page/PageLayout.cshtml"; ViewBag.PageModel = Model; - ViewBag.Title = string.Format(Texts.Front_Page_Media_DateUnknown, Model.Body.Title); + ViewBag.Title = string.Format(Texts.Front_Page_Media_Title, Model.Body.Title); var groups = Model.Body.Media .GroupBy(x => x.Date?.ReadableYear) diff --git a/src/Bonsai/Areas/Front/Views/Tree/Main.cshtml b/src/Bonsai/Areas/Front/Views/Tree/Main.cshtml index bd1c79ca..333607d0 100644 --- a/src/Bonsai/Areas/Front/Views/Tree/Main.cshtml +++ b/src/Bonsai/Areas/Front/Views/Tree/Main.cshtml @@ -6,7 +6,7 @@ @{ Layout = "TreeLayout"; - ViewBag.Title = string.Format(Texts.Front_Tree_Title, Model.Title); + ViewBag.Title = string.Format(Texts.Front_Page_Tree_Title, Model.Title); var cfg = ConfigService.GetDynamicConfig(); } diff --git a/src/Bonsai/Bonsai.csproj b/src/Bonsai/Bonsai.csproj index 1903ddb5..97569178 100644 --- a/src/Bonsai/Bonsai.csproj +++ b/src/Bonsai/Bonsai.csproj @@ -124,6 +124,9 @@ + + Texts.resx + PublicResXFileCodeGenerator Texts.Designer.cs diff --git a/src/Bonsai/Code/Utils/Date/FuzzyDate.cs b/src/Bonsai/Code/Utils/Date/FuzzyDate.cs index 737db149..13e99bf3 100644 --- a/src/Bonsai/Code/Utils/Date/FuzzyDate.cs +++ b/src/Bonsai/Code/Utils/Date/FuzzyDate.cs @@ -285,7 +285,7 @@ private string GetFullReadableDate() ? MonthNames[Month!.Value] : string.Format(MonthPreciseNames[Month!.Value], Day.Value); - return string.Format(IsDecade ? Texts.FuzzyDate_FullDecadeFormat : Texts.FuzzyDate_FullYearFormat, monthPart); + return string.Format(IsDecade ? Texts.FuzzyDate_FullDecadeFormat : Texts.FuzzyDate_FullYearFormat, monthPart, Year); } /// diff --git a/src/Bonsai/Localization/Texts.Designer.cs b/src/Bonsai/Localization/Texts.Designer.cs index f1d9fea0..65d7eae3 100644 --- a/src/Bonsai/Localization/Texts.Designer.cs +++ b/src/Bonsai/Localization/Texts.Designer.cs @@ -132,15 +132,6 @@ public static string Admin_Changesets_Details_Main { } } - /// - /// Looks up a localized string similar to Восстановить. - /// - public static string Admin_Changesets_Details_Revert { - get { - return ResourceManager.GetString("Admin_Changesets_Details_Revert", resourceCulture); - } - } - /// /// Looks up a localized string similar to Просмотр правки. /// @@ -411,21 +402,12 @@ public static string Admin_Changesets_RelationTitleFormat { } } - /// - /// Looks up a localized string similar to Удалить. - /// - public static string Admin_Changesets_Remove { - get { - return ResourceManager.GetString("Admin_Changesets_Remove", resourceCulture); - } - } - /// /// Looks up a localized string similar to Восстановить. /// - public static string Admin_Changesets_Restore { + public static string Admin_Changesets_Revert { get { - return ResourceManager.GetString("Admin_Changesets_Restore", resourceCulture); + return ResourceManager.GetString("Admin_Changesets_Revert", resourceCulture); } } @@ -780,15 +762,6 @@ public static string Admin_Config_TreeKinds_FullTreeDescription { } } - /// - /// Looks up a localized string similar to <b>Ошибка:</b> пожалуйста, убедитесь, что вы заполнили все поля корректно и попробуйте снова.. - /// - public static string Admin_Config_ValidationError { - get { - return ResourceManager.GetString("Admin_Config_ValidationError", resourceCulture); - } - } - /// /// Looks up a localized string similar to Версия. /// @@ -844,7 +817,7 @@ public static string Admin_Dashboard_CreatedFormatM { } /// - /// Looks up a localized string similar to Здесь будет показываться список последних действий. <br/> Вы можете создать <a href="{0}">страницу</a> или <a href="{1}">загрузить медиа-файлы</a>.. + /// Looks up a localized string similar to Здесь будет показываться список последних действий. <br/> Вы можете <a href="{0}">создать страницу</a> или <a href="{1}">загрузить медиа-файлы</a>.. /// public static string Admin_Dashboard_EmptyMessageFormat { get { @@ -1248,6 +1221,15 @@ public static string Admin_Global_Type { } } + /// + /// Looks up a localized string similar to <strong>Ошибка:</strong> пожалуйста, убедитесь, что вы заполнили все поля корректно и попробуйте снова.. + /// + public static string Admin_Global_ValidationError { + get { + return ResourceManager.GetString("Admin_Global_ValidationError", resourceCulture); + } + } + /// /// Looks up a localized string similar to Просмотреть. /// @@ -2689,15 +2671,6 @@ public static string Admin_Users_Editor_ValidateTitle { } } - /// - /// Looks up a localized string similar to <strong>Ошибка:</strong> пожалуйста, убедитесь, что вы заполнили все поля корректно и попробуйте снова.. - /// - public static string Admin_Users_Editor_ValidationError { - get { - return ResourceManager.GetString("Admin_Users_Editor_ValidationError", resourceCulture); - } - } - /// /// Looks up a localized string similar to Операция запрещена для данного пользователя!. /// @@ -2851,15 +2824,6 @@ public static string Admin_Users_PasswordChangeFailedMessage { } } - /// - /// Looks up a localized string similar to <strong>Ошибка:</strong> пожалуйста, убедитесь, что вы заполнили все поля корректно и попробуйте снова.. - /// - public static string Admin_Users_PasswordReset_Error { - get { - return ResourceManager.GetString("Admin_Users_PasswordReset_Error", resourceCulture); - } - } - /// /// Looks up a localized string similar to Сохранить и разблокировать. /// @@ -5047,15 +5011,6 @@ public static string Front_Register_Email_Hint { } } - /// - /// Looks up a localized string similar to <b>Ошибка:</b> пожалуйста, убедитесь, что вы заполнили все поля корректно и попробуйте снова.. - /// - public static string Front_Register_Error { - get { - return ResourceManager.GetString("Front_Register_Error", resourceCulture); - } - } - /// /// Looks up a localized string similar to Имя. /// @@ -5335,15 +5290,6 @@ public static string Front_Tree_Loading { } } - /// - /// Looks up a localized string similar to {0} — Фамильное древо. - /// - public static string Front_Tree_Title { - get { - return ResourceManager.GetString("Front_Tree_Title", resourceCulture); - } - } - /// /// Looks up a localized string similar to {0} {1}. /// diff --git a/src/Bonsai/Localization/Texts.en-us.resx b/src/Bonsai/Localization/Texts.en-us.resx new file mode 100644 index 00000000..0f9915cb --- /dev/null +++ b/src/Bonsai/Localization/Texts.en-us.resx @@ -0,0 +1,2206 @@ + + + text/microsoft-resx + + + 1.3 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + This change cannot be reverted. + + + Action + + + Author + + + Contents + + + Date + + + Edit + + + Main data + + + Changeset view + + + View current version + + + female + + + male + + + Unknown + + + No changesets exist. + + + No changesets were found. + + + Changesets + + + Media + + + Date + + + Tags + + + Description + + + Event + + + Location + + + Title + + + Changeset not found. + + + Aliases + + + Facts + + + Photo + + + Text + + + Title + + + Type + + + {0} ({1}, {2}) + + + Main page + + + End + + + Event + + + Related page + + + Related pages + + + Start + + + Relation type + + + Restore + + + Changeset was reverted. + + + Changeset + + + Are you sure you want to remove the media? + + + Remove media + + + Are you sure you want to remove the page? + + + Remove page + + + Are you sure you want to remove the relation? + + + Remove relation + + + Are you sure you want to restore the media's previous state? + + + Restore media + + + This and all newer changes (if any) will be discarded. + + + Are you sure you want to restore the page's previous state? + + + Restore page + + + Are you sure you want to restore the relation's previous state? + + + Restore relation + + + Unknown entity type: {0}! + + + Access + + + Any visitor can read + + + Only registered can read + + + Caption + + + Displayed in the header + + + Registration + + + Forbidden + + + Allowed + + + Settings saved. + + + Settings + + + Tree display + + + Fast and rough + + + Hide black ribbon on the cards of deceased people + + + Slow and thorough + + + Tree kinds + + + Ancestors + + + all blood relatives upwards + + + Close relatives + + + two levels around, grandparents to grandchildren + + + Descendants + + + all blood relatives downwards, including other parents + + + Full tree + + + the whole connected graph of relatives + + + Version + + + Build + + + Unknown + + + Database + + + {0} created {1} + + + {0} created {1} + + + The latest actions will be shown here.<br/>You can <a href="{0}">create a page</a> or <a href="{1}">upload a media-file</a>. + + + between pages: {0} and {1} + + + media file|media files + + + {0} without tags + + + page + + + page|pages + + + {0} can be improved + + + relation + + + relation|relations + + + {0} removed {1} + + + {0} removed {1} + + + request|requests + + + {0} restored {1} + + + {0} restored {1} + + + Dashboard + + + {0} updated {1} + + + {0} updated {1} + + + {0} uploaded {1} + + + + {0} uploaded {1} + + + + user|users + + + Bonsai works in demo mode. All data is periodically reset. + + + Value must be between 1 and 100 + + + Please enter the site's caption + + + Caption length cannot exceed 200 characters + + + Forbidden in demo mode + + + Add + + + Back + + + Cancel + + + Changes + + + Clear filter + + + Contradicting facts + + + Create + + + Date + + + Edit + + + Error + + + Find + + + Change history + + + Nothing found for your request. + + + Pick + + + Preview + + + Remove + + + Save + + + Search + + + Title + + + Type + + + View + + + Pick media + + + Add tag + + + Title + + + Date + + + Description + + + Event + + + Location + + + Remove tag + + + Edit media + + + Tags + + + No files have been uploaded. + + + No files have been found for your request. + + + Shot at + + + Tags + + + Media index + + + Upload + + + Uploaded at + + + Upload a new media + + + Media not found + + + Media removed. + + + Remove completely (releases disk space, cannot be reverted) + + + Are you sure you want to remove this media file? + + + Remove media + + + Unknown file type + + + Media updated. + + + {0} B + + + {0} GB + + + {0} KB + + + {0} MB + + + Click here to upload a new file + + + Up to {1} + + + Media upload + + + Use file name as title + + + Changes + + + Config + + + Dashboard + + + Media + + + Pages + + + Relations + + + Access + + + Pick page + + + Aliases + + + Text + + + Facts + + + Photo + + + Title + + + Page created. + + + Address + + + Name + + + Birthday + + + Birth place + + + Date + + + Gender + + + Name + + + Photo + + + Relations + + + Species + + + Text + + + Add new alias + + + Create page + + + Text + + + Loaded from a draft from {0}. + + + Draft for a page of type "{0}" has been restored. + + + If you want to create a new page of type "{0}", save the current page or <a href="#" class="cmd-discard-draft" data-page-type="{1}">remove</a> the draft. + + + Edit page + + + Incorrectly filled fields: {0} + + + Photo + + + Pick + + + Upload + + + Facts cannot be specified for this type of page. + + + Remove draft + + + Aliases + + + Facts + + + Main + + + Title + + + Add fact + + + Type + + + Date unknown + + + First name + + + Female + + + Male + + + Please read the <strong><a href="#" class="cmd-show-popup" data-popup-url="{0}">style guide</a></strong> before working with pages. + + + Language + + + Level + + + Last name + + + Link + + + Type + + + Middle name + + + Remove fact + + + Rhesus + + + Negative (R-) + + + Positive (R+) + + + Unknown + + + Title + + + Level + + + Value + + + Unspecified + + + Created + + + Create new page + + + No pages have been created. + + + No pages have been found for your request. + + + Media + + + Rank + + + Relations + + + Page index + + + Changed + + + Page does not exist! + + + Page removed + + + Remove page and all references to it completely (irreversible) + + + Are you sure you want to remove the page <b>{0}</b>? + + + Remove page + + + Page updated. + + + Please enter the page title + + + Page title cannot exceed 200 characters + + + {0} {1} + + + Relation created. + + + Create relation + + + Duration end + + + Duration start + + + Edit relation + + + Event link + + + Relation type + + + Create new relation + + + No relations have been created. + + + No relations have been found for your request. + + + Page + + + Page title + + + Related page + + + Relation type + + + Relation index + + + Relation not found + + + Relation removed. + + + Remove completely (irreversible) + + + Are you sure you want to remove the relation <b>{0}</b> between pages <b>{1}</b> and <b>{2}</b>? + + + Remove relation + + + Relation updated + + + Unknown + + + This user account cannot be removed. + + + Your own user account cannot be removed. + + + User created. + + + Access + + + Create new + + + Create user account + + + Edit user account + + + Lock state + + + Locked out + + + or + + + Page + + + You are creating a password-based account. + + + This authentication type is not the most secure and convenient, but does not require a social profile. It is best suited for giving to elderly relatives or checking out Bonsai's features quickly. + + + If the user forgets their password, only the administrator will be able to restore it. + + + Active + + + User validation + + + Operation is restricted for current user! + + + Access + + + Change password + + + Create new account + + + Password account + + + Email + + + Locked out + + + Locked out forever + + + Locked out until {0} + + + Name + + + Name / E-mail + + + No users have been found for your request. + + + Password auth + + + User index + + + User not found + + + Password auth is disabled in settings. + + + Password change failed, please try again. + + + Password changed. + + + <b>Error:</b> please make sure you filled all fields correctly, and try again. + + + Save and unlock + + + Password reset + + + Contact #{0}: email address is invalid + + + Contact #{0}: value must either be a link or start with @ + + + Contact #{0}: link must start with 'https://' + + + Contact #{0}: phone number must start with + and contain only digits + + + Contact #{0}: type is not selected + + + Contact #{0}: value is missing + + + Death date cannot be specified if it is marked as unknown. + + + Username + + + User removed. + + + User removal failed, please try again. + + + You cannot remove a user that has made any changes. + + + Instead you can lock the account so that they can no longer log in. + + + You cannot remove your own account. + + + This operation cannot be reversed. + + + Are you sure you want to remove user <b>{0}</b>? + + + Remove user + + + User updated + + + Enter correct date + + + Aliases are already used by other pages: {0} + + + Facts format is incorrect! + + + Biological parents cannot be of the same gender + + + Birthday cannot be later than date of death + + + Fact {0} is filled incorrectly! + + + Aliases format is incorrect! + + + Media file is not a photo! + + + A person cannot have more than 2 biological parents + + + Marriage duration cannot exceed a spouse's lifetime: {0} + + + Two persons cannot be parents to each other + + + Parent cannot be younger than their child + + + Photo not found! + + + Birthday of one spouse ({0}) cannot be later than the death date of another ({1}) + + + Page with the same title already exists. + + + Fact type {0} does not exist. + + + The same relation already exists. + + + This type of relation cannot have a date + + + This type of relation cannot have an event + + + Event page is required + + + Only one page can be specified when editing a relation + + + Pick a page + + + Relation type is not allowed for the types of pages + + + Duration start cannot be later than the end + + + Email is already used by another user + + + Birthday is specified incorrectly. + + + Passwords do not match. + + + Password must be at least 6 symbols long. + + + Google + + + VK.com + + + Yandex + + + Email is already registered + + + Password must be at least 6 symbols long. + + + Passwords do not match. + + + Birthday is specified incorrectly. + + + Birthday + + + Birth + + + Birthday ({0}) + + + Adoption + + + Adoption + + + Death anniversary + + + Death + + + {0} death anniversary + + + Event + + + Pet adoption + + + Wedding anniversary + + + Wedding + + + {0} wedding anniversary + + + Wedding + + + f + + + G + + + YYYY.MM.DD + + + From + + + To + + + A (II) + + + AB (IV) + + + B (III) + + + 0 (I) + + + Media + + + Page + + + Relation + + + Created + + + Removed + + + Restored + + + Updated + + + E-mail + + + Facebook + + + Github + + + Odnoklassniki + + + Phone + + + Telegram + + + Twitter + + + VK.com + + + Youtube + + + Basic + + + Intermediate + + + Native + + + Fluent + + + Save + + + Save and open next + + + MMMM dd, yyyy + + + Document + + + Photo + + + Photosphere + + + Video + + + Event + + + Location + + + Other + + + Person + + + Pet + + + Child + + + Colleague + + + Event + + + Participant + + + Friend + + + Location + + + Inhabitant + + + Other + + + Owner + + + Parent + + + Pet + + + Spouse + + + Stepchild + + + Stepparent + + + Beginner + + + Intermediate + + + Expert + + + Ancestors + + + Family + + + Descendants + + + Full + + + Administrator + + + Editor + + + New + + + Reader + + + Birthday + + + Date + + + Birth place + + + Place + + + Burial place + + + Burial + + + Cause of death + + + Cause + + + Death date + + + Date + + + Death place + + + Place + + + Date + + + Biology + + + Birth + + + Death + + + Main + + + Other + + + Personality + + + Address + + + Acquired + + + Sold + + + Blood type + + + B. type + + + Eye color + + + Eyes + + + Gender + + + Hair color + + + Hair + + + Language + + + Language|Languages + + + Name + + + Name|Names + + + Profession + + + Profession|Professions + + + Religion + + + Religion|Religions + + + Hobby + + + Contacts + + + Breed + + + Color + + + Gender + + + Name + + + Species + + + Authentication via the specified provider failed. <br/> Please try again or contact Bonsai admin. + + + Back to auth page + + + Auth error + + + Event + + + Nothing happened on this day. + + + Mo, Tu, We, Th, Fr, Sa, Su + + + Add page + + + Alas, this page does not exist.<br/>Maybe it does not exist yet, or you have followed a bad link. + + + Error 404 + + + To main page + + + Page not found + + + Unknown + + + Female + + + Male + + + {0} {1} {2} + + + Last names + + + Main page + + + New media + + + Updated pages + + + Bonsai failed to start up.<br/>Detailed information can be found in server logs. + + + Bonsai is loading... + + + Sit back and relax - this will take less than a minute :) + + + Loading + + + Demo admin account: + + + Or use the login and password provided by your administrator: + + + Log in via {0} + + + Log in + + + Page is only available to registered users. + + + Password + + + Login and password auth + + + Please authenticate via one of the following services: + + + You can also <a href="{0}">register a new account</a>, or use the login and password provided by your administrator: + + + <b>Error:</b> Authorization failed.<br/>Maybe your password was entered incorrectly? Please try again. + + + <b>Error:</b> your account is locked out. + + + Your account has not yet been checked by the administrator.<br/>Please wait for the check - only then you will be able to log in. + + + Log in + + + Username + + + Actions + + + Date + + + Depicted + + + Download + + + Edit + + + Event + + + Location + + + Source + + + Photo + + + Your browser does not support video playback. + + + Video is being processed... + + + Video will be available after processing. Try reloading the page. + + + Changes + + + Media + + + Relations + + + Text and facts + + + No information. + + + Date is unknown + + + No media files + + + Long time ago + + + {0} — Media + + + This page is not referenced anywhere. + + + This page is referenced in the following pages: + + + Description + + + Media + + + References + + + Tree + + + Fullscreen + + + New window + + + {0} — Family tree + + + Registration is disabled + + + Account cannot be created, because registration is disabled by the administrator. + + + To main page + + + Your account will be validated by the administrator, then you can log in and use the system. + + + You are successfully registered! + + + Registration + + + Birthday + + + Create personal page + + + E-mail + + + Use it to log in + + + Name + + + Your account will get administration rights. + + + Please make sure you have provided actual data without mistakes.<br/>Your account will be validated by the administrator, then you can log in and use the system. + + + Last name + + + Middle name + + + Options + + + Password + + + At least 6 symbols + + + Repeat password + + + Submit + + + Please fill all required fields to create an account. + + + Registration + + + Please enter your birthday. + + + Please enter the date in YYYY.MM.DD format. + + + Please enter the e-mail. + + + Please enter a valid e-mail. + + + Please enter your first name. + + + Please enter your last name. + + + Nothing found for your query. + + + Search... + + + Query is too short. Please enter at least 3 characters. + + + Search results + + + Search + + + Could not load family tree. + + + Loading... + + + {0} {1} + + + {0}..{1} {2} + + + Less than a month + + + Less than a year + + + {0} {1} + + + {0} {1} + + + April + + + April {0} + + + August + + + August {0} + + + {0}-s + + + December + + + December {0} + + + February + + + February {0} + + + {0}, {1}-s + + + {0}, {1} + + + January + + + January {0} + + + July + + + July {0} + + + June + + + June {0} + + + March + + + March {0} + + + May + + + May {0} + + + month|months + + + November + + + November {0} + + + October + + + October {0} + + + September + + + September {0} + + + {0} + + + year|years + + + since {0} + + + {0} — {1} + + + until {0} + + + in {0}-s + + + in {0} + + + since {0}-s + + + since {0} + + + until {0}-s + + + until {0} + + + Page not found. + + + User not found + + + {0} from {1} + + + Not selected + + + Administration + + + Log in + + + Log out + + + Page + + + Please enter the search query + + + Nothing found + + + Invalid date + + + en-us + + + en-US + + + All changes will be discarded.\n\nAre you sure? + + + Draft saved at {0} + + + English + + + +1234567890 + + + Description + + + Formatting reference + + + Pick media + + + Pick page + + + Close + + + %curr% of %total% + + + Could not load data. + + + Page or name + + + (no link) + + + Could not upload image! + + + Media list load failed. + + + Page list load failed. + + + Enter page name + + + Page or title + + + File is too large! + + + Unknown error + + + Enter name + + + Media alignment is specified more than once. + + + Unknown media alignment. + + + Media description is specified more than once. + + + Media file {0} does not exist. + + + Page not found: {0}. + + + Media size is specified more than once., + + + Unknown media size. + + + Grandson|Granddaughter|Grandchild + + + Grandchildren + + + Son-in-law + + + Sons-in-law + + + Daughter-in-law + + + Daughters-in-law + + + Colleague + + + Colleagues + + + Event + + + Participant|Participant|Participant + + + Participants + + + Events + + + Friend|Friend|Friend + + + Friends + + + Pages + + + People + + + Relatives + + + Location + + + Inhabitant|Inhabitant|Inhabitant + + + Inhabitants + + + Locations + + + Owner|Owner|Owner + + + Owners + + + Parent + + + Sister + + + Sisters + + + Brother + + + Brothers + + + Mother + + + Father + + + Grandmother + + + Grandmothers + + + Grandfather + + + Grandfathers + + + Parents + + + Pet + + + Pets + + + Son|Daughter|Child + + + Children + + + Wife + + + Sister-in-law + + + Sisters-in-law + + + Brother-in-law + + + Brothers-in-law + + + Mother-in-law + + + Father-in-law + + + Husband + + + Sister-in-law + + + Sisters-in-law + + + Brother-in-law + + + Brothers-in-law + + + Mother-in-law + + + Father-in-law + + + Son|Daughter|Child + + + Children + + + Processing configuration + + + Cleaning up the database + + + Preparing the database + + + Transitioning the database + + + Detecting page references + + + Preparing search index + + + Preparing demo data + + + Building family trees + + \ No newline at end of file diff --git a/src/Bonsai/Localization/Texts.resx b/src/Bonsai/Localization/Texts.resx index f3d5bb91..01f49ebc 100644 --- a/src/Bonsai/Localization/Texts.resx +++ b/src/Bonsai/Localization/Texts.resx @@ -511,9 +511,6 @@ Будет использоваться в качестве логина - - <b>Ошибка:</b> пожалуйста, убедитесь, что вы заполнили все поля корректно и попробуйте снова. - Имя @@ -586,9 +583,6 @@ Загрузка... - - {0} — Фамильное древо - Страница не найдена. @@ -905,7 +899,7 @@ G - dd MMMM yy + dd MMMM yyyy A (II) @@ -1550,9 +1544,6 @@ Редактировать - - Восстановить - Текущая версия @@ -1586,10 +1577,7 @@ Просмотреть - - Удалить - - + Восстановить @@ -1700,9 +1688,6 @@ весь связанный граф родственников - - <b>Ошибка:</b> пожалуйста, убедитесь, что вы заполнили все поля корректно и попробуйте снова. - Версия @@ -1724,8 +1709,8 @@ {0} =user, {1} = subject - Здесь будет показываться список последних действий. <br/> Вы можете создать <a href="{0}">страницу</a> или <a href="{1}">загрузить медиа-файлы</a>. - {0} = create page link, {1} = upload media link + Здесь будет показываться список последних действий. <br/> Вы можете <a href="{0}">создать страницу</a> или <a href="{1}">загрузить медиа-файлы</a>. + {0} = create page link, {1} = upload media link между страницами: {0} и {1} @@ -2242,7 +2227,7 @@ Удаление пользователя - + <strong>Ошибка:</strong> пожалуйста, убедитесь, что вы заполнили все поля корректно и попробуйте снова. @@ -2293,9 +2278,6 @@ Валидация пользователя - - <strong>Ошибка:</strong> пожалуйста, убедитесь, что вы заполнили все поля корректно и попробуйте снова. - Введите название для заголовка сайта