Resolving Mergeissue

这个提交包含在:
int2001 2023-11-29 08:13:33 +00:00
父节点 218e5a267b
当前提交 086bc233d2
找不到此签名对应的密钥
GPG 密钥 ID: DFB1C13CD2DB037B

查看文件

@ -8,34 +8,34 @@ Station Logbooks
___________________________________________________________________________________________
*/
$lang['station_logbooks'] = "Station Logbooks";
$lang['station_logbooks_description_header'] = "What are Station Logbooks";
$lang['station_logbooks_description_text'] = "Station Logbooks allow you to group Station Locations, this allows you to see all the locations across one session from the logbook areas to the analytics. Great for when your operating in multiple locations but they are part of the same DXCC or VUCC Circle.";
$lang['station_logbooks_create'] = "Create Station Logbook";
$lang['station_logbooks_status'] = "Status";
$lang['station_logbooks_link'] = "Link";
$lang['station_logbooks_public_search'] = "Public Search";
$lang['station_logbooks_set_active'] = "Set as Active Logbook";
$lang['station_logbooks_active_logbook'] = "Active Logbook";
$lang['station_logbooks_edit_logbook'] = "Edit Station Logbook"; // Full sentence will be generated 'Edit Station Logbook: [Logbook Name]'
$lang['station_logbooks_confirm_delete'] = "Are you sure you want to delete the following station logbook? You must re-link any locations linked here to another logbook.: ";
$lang['station_logbooks_view_public'] = "View Public Page for Logbook: ";
$lang['station_logbooks_create_name'] = "Station Logbook Name";
$lang['station_logbooks_create_name_hint'] = "You can call a station logbook anything.";
$lang['station_logbooks_edit_name_hint'] = "Shortname for the station logbook. For example: Home Log (IO87IP)";
$lang['station_logbooks_edit_name_update'] = "Update Station Logbook Name";
$lang['station_logbooks_public_slug'] = "Public Slug";
$lang['station_logbooks_public_slug_hint'] = "Setting a public slug allows you to share your logbook with anyone via a custom website address, this slug can contain letters & numbers only.";
$lang['station_logbooks_public_slug_format1'] = "Later it looks like this:";
$lang['station_logbooks_public_slug_format2'] = "[your slug]";
$lang['station_logbooks_public_slug_input'] = "Type in Public Slug choice";
$lang['station_logbooks_public_slug_visit'] = "Visit Public Page";
$lang['station_logbooks_public_search_hint'] = "Enabling public search function offers a search input box on the public logbook page accessed via public slug. Search only covers this logbook.";
$lang['station_logbooks_public_search_enabled'] = "Public search enabled";
$lang['station_logbooks_select_avail_loc'] = "Select Available Station Locations";
$lang['station_logbooks_link_loc'] = "Link Location";
$lang['station_logbooks_linked_loc'] = "Linked Locations";
$lang['station_logbooks_no_linked_loc'] = "No Linked Locations";
$lang['station_logbooks'] = "Журналы станции";
$lang['station_logbooks_description_header'] = "Что такое журнал станции";
$lang['station_logbooks_description_text'] = "Журналы станции позволяют вам группировать расположения станции, это позволяет вам видеть все расположения станции в одном журнале для аналитики. Удобно если вы работает из нескольких расположений, но все они -- часть одного и того же DXCC или VUCC Circle.";
$lang['station_logbooks_create'] = "Создать журнал станции";
$lang['station_logbooks_status'] = "Статус";
$lang['station_logbooks_link'] = "Ссылка";
$lang['station_logbooks_public_search'] = "Публичный поиск";
$lang['station_logbooks_set_active'] = "Установить как активный журнал";
$lang['station_logbooks_active_logbook'] = "Активный журнал";
$lang['station_logbooks_edit_logbook'] = "Редактировать журнал"; // Full sentence will be generated 'Edit Station Logbook: [Logbook Name]'
$lang['station_logbooks_confirm_delete'] = "Вы уверены, что хотите удалить следующий журнал? Вы должны связать все привязанные к нему расположения станций к другим журналам.: ";
$lang['station_logbooks_view_public'] = "Просмотр публичной страницы журнала: ";
$lang['station_logbooks_create_name'] = "Имя журнала";
$lang['station_logbooks_create_name_hint'] = "Вы можете назвать журнал станции как угодно.";
$lang['station_logbooks_edit_name_hint'] = "Короткое название для журнала станции, например: Home Log (IO87IP)";
$lang['station_logbooks_edit_name_update'] = "Обновить имя журнала станции";
$lang['station_logbooks_public_slug'] = "Публичная метка";
$lang['station_logbooks_public_slug_hint'] = "Установка публичной метки позволит вам поделиться вашим журналом, используя веб-ссылку, это имя должно содержать только буквы и цифры.";
$lang['station_logbooks_public_slug_format1'] = "Ссылка будет выглядеть так:";
$lang['station_logbooks_public_slug_format2'] = "[публичная метка]";
$lang['station_logbooks_public_slug_input'] = "Введите публичную метку";
$lang['station_logbooks_public_slug_visit'] = "Посетите публичную страницу";
$lang['station_logbooks_public_search_hint'] = "Включение функции публичного поиска открывает поле ввода для поиска на странице публичного журнала, доступ к которой осуществляется по публичной метке. Поиск производится только в данном журнале.";
$lang['station_logbooks_public_search_enabled'] = "Публичный поиск включен";
$lang['station_logbooks_select_avail_loc'] = "Выберите доступное расположение станции";
$lang['station_logbooks_link_loc'] = "Привяжите расположение";
$lang['station_logbooks_linked_loc'] = "Привязанные расположения";
$lang['station_logbooks_no_linked_loc'] = "Нет привязанных расположений";
@ -44,68 +44,67 @@ ________________________________________________________________________________
Station Locations
___________________________________________________________________________________________
*/
$lang['station_location'] = 'Station Location';
$lang['station_location_plural'] = "Station Locations";
$lang['station_location_header_ln1'] = 'Station Locations define operating locations, such as your QTH, a friends QTH, or a portable station.';
$lang['station_location_header_ln2'] = 'Similar to logbooks, a station profile keeps a set of QSOs together.';
$lang['station_location_header_ln3'] = 'Only one station may be active at a time. In the table below this is shown with the -Active Station- badge.';
$lang['station_location_create_header'] = 'Create Station Location';
$lang['station_location_create'] = 'Create a Station Location';
$lang['station_location_edit'] = 'Edit Station Location: ';
$lang['station_location_updated_suff'] = ' Updated.';
$lang['station_location_warning'] = 'Attention: You need to set an active station location. Go to Callsign->Station Location to select one.';
$lang['station_location_reassign_at'] = 'Please reassign them at ';
$lang['station_location_warning_reassign'] = 'Due to recent changes within Cloudlog you need to reassign QSOs to your station profiles.';
$lang['station_location_name'] = 'Profile Name';
$lang['station_location_name_hint'] = 'Shortname for the station location. For example: Home (IO87IP)';
$lang['station_location_callsign'] = 'Station Callsign';
$lang['station_location_callsign_hint'] = 'Station callsign. For example: 2M0SQL/P';
$lang['station_location_power'] = 'Station Power (W)';
$lang['station_location_power_hint'] = 'Default station power in Watt. Overwritten by CAT.';
$lang['station_location_emptylog'] = 'Empty Log';
$lang['station_location_confirm_active'] = 'Are you sure you want to make the following station the active station: ';
$lang['station_location_set_active'] = 'Set Active';
$lang['station_location_active'] = 'Active Station';
$lang['station_location_claim_ownership'] = 'Claim Ownership';
$lang['station_location_confirm_del_qso'] = 'Are you sure you want to delete all QSOs within this station profile?';
$lang['station_location_confirm_del_stationlocation'] = 'Are you sure you want delete station profile ';
$lang['station_location_confirm_del_stationlocation_qso'] = 'This will delete all QSOs within this station profile?';
$lang['station_location_dxcc'] = 'Station DXCC';
$lang['station_location_dxcc_hint'] = 'Station DXCC entity. For example: Scotland';
$lang['station_location_dxcc_warning'] = "Stop here for a Moment. Your chosen DXCC is outdated and not valid anymore. Check which DXCC for this particular location is the correct one. If you are sure, ignore this warning.";
$lang['station_location_city'] = 'Station City';
$lang['station_location_city_hint'] = 'Station city. For example: Inverness';
$lang['station_location_state'] = 'Station State';
$lang['station_location_state_hint'] = 'Station state. Applies to certain countries only. Leave blank if not applicable.';
$lang['station_location_county'] = 'Station County';
$lang['station_location_county_hint'] = 'Station County (Only used for USA/Alaska/Hawaii).';
$lang['station_location_gridsquare'] = 'Station Gridsquare';
$lang['station_location_gridsquare_hint_ln1'] = "Station gridsquare. For example: IO87IP. If you don't know your grid square then <a href='https://zone-check.eu/?m=loc' target='_blank'>click here</a>!";
$lang['station_location_gridsquare_hint_ln2'] = "If you are located on a grid line, enter multiple grid squares separated with commas. For example: IO77,IO78,IO87,IO88.";
$lang['station_location_iota_hint_ln1'] = "Station IOTA reference. For example: EU-005";
$lang['station_location_iota_hint_ln2'] = "You can look up IOTA references at the <a target='_blank' href='https://www.iota-world.org/iota-directory/annex-f-short-title-iota-reference-number-list.html'>IOTA World</a> website.";
$lang['station_location_sota_hint_ln1'] = "Station SOTA reference. You can look up SOTA references at the <a target='_blank' href='https://www.sotamaps.org/'>SOTA Maps</a> website.";
$lang['station_location_wwff_hint_ln1'] = "Station WWFF reference. You can look up WWFF references at the <a target='_blank' href='https://www.cqgma.org/mvs/'>GMA Map</a> website.";
$lang['station_location_pota_hint_ln1'] = "Station POTA reference. You can look up POTA references at the <a target='_blank' href='https://pota.app/#/map/'>POTA Map</a> website.";
$lang['station_location_signature'] = "Signature";
$lang['station_location_signature_name'] = "Signature Name";
$lang['station_location_signature_name_hint'] = "Station Signature (e.g. GMA)..";
$lang['station_location_signature_info'] = "Signature Information";
$lang['station_location_signature_info_hint'] = "Station Signature Info (e.g. DA/NW-357).";
$lang['station_location_eqsl_hint'] = 'The QTH Nickname which is configured in your eQSL Profile';
$lang['station_location_qrz_subscription'] = 'Subscription Required';
$lang['station_location_qrz_hint'] = "Find your API key on <a href='https://logbook.qrz.com/logbook' target='_blank'>the QRZ.com Logbook settings page";
$lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload';
$lang['station_location_hrdlog_realtime_upload'] = "HRDLog.net Logbook Realtime Upload";
$lang['station_location_hrdlog_hint'] = "Create your API Code on <a href='http://www.hrdlog.net/EditUser.aspx' target='_blank'>HRDLog.net Userprofile page";
$lang['station_location_qo100_hint'] = "Create your API key on <a href='https://qo100dx.club' target='_blank'>your QO-100 Dx Club's profile page";
$lang['station_location_qo100_realtime_upload'] = "QO-100 Dx Club Realtime Upload";
$lang['station_location_oqrs_enabled'] = "OQRS Enabled";
$lang['station_location_oqrs_email_alert'] = "OQRS Email alert";
$lang['station_location_oqrs_email_hint'] = "Make sure email is set up under admin and global options.";
$lang['station_location_oqrs_text'] = "OQRS Text";
$lang['station_location_oqrs_text_hint'] = "Some info you want to add regarding QSL'ing.";
$lang['station_location'] = 'Расположение станции';
$lang['station_location_plural'] = "Расположения станции";
$lang['station_location_header_ln1'] = 'Расположения станции определяют места работы, например, ваш QTH, QTH друзей или портативная станция.';
$lang['station_location_header_ln2'] = 'Также, как и журнал, профиль станции хранит в одном месте набор QSO.';
$lang['station_location_header_ln3'] = 'Только одна станция может быть активно в каждый момент. В таблице ниже она отмечена меткой -Активная станция-.';
$lang['station_location_create_header'] = 'Создать расположение станции';
$lang['station_location_create'] = 'Создать расположение станции';
$lang['station_location_edit'] = 'Редактировать расположение станции: ';
$lang['station_location_updated_suff'] = ' Обновлено.';
$lang['station_location_warning'] = 'Внимание. Вам нужно установить активное расположение станции. Перейдите в меню Позывной->Расположение станции, чтобы выбрать.';
$lang['station_location_reassign_at'] = 'Пожалуйста, переназначьте их в ';
$lang['station_location_warning_reassign'] = 'Из-за недавних изменений в Cloudlog вам нужно переназначить QSO вашим профилям станции.';
$lang['station_location_name'] = 'Название профиля';
$lang['station_location_name_hint'] = 'Короткое название профиля расположения станции, к примеру: Home (IO87IP)';
$lang['station_location_callsign'] = 'Позывной станции';
$lang['station_location_callsign_hint'] = 'Позывной станции, например: 2M0SQL/P';
$lang['station_location_power'] = 'Мощность станции (Вт)';
$lang['station_location_power_hint'] = 'Мощность станции по умолчанию в Вт. Перезаписывается данными из CAT.';
$lang['station_location_emptylog'] = 'Очистить лог';
$lang['station_location_confirm_active'] = 'Вы уверены, что хотите сделать эту станцию активой: ';
$lang['station_location_set_active'] = 'Установить активной';
$lang['station_location_active'] = 'Активная станция';
$lang['station_location_claim_ownership'] = 'Заявить собственность';
$lang['station_location_confirm_del_qso'] = 'Вы уверены, что хотите удалить все QSO из этого профиля станции?';
$lang['station_location_confirm_del_stationlocation'] = 'Вы уверены, что хотите удалить профиль станции ';
$lang['station_location_confirm_del_stationlocation_qso'] = ', это удалит все QSO, содержащиеся в этом профиле станции?';
$lang['station_location_dxcc'] = 'DXCC';
$lang['station_location_dxcc_hint'] = 'DXCC станции, к примеру: Scotland';
$lang['station_location_dxcc_warning'] = "Остановитесь на мгновение. Выбранный вами DXCC устарел и больше не действителен. Проверьте, какой DXCC для данного конкретного места является правильным. Если вы уверены, проигнорируйте это предупреждение.";
$lang['station_location_city'] = 'город';
$lang['station_location_city_hint'] = 'Город станции, к примеру: Inverness';
$lang['station_location_state'] = 'Штат';
$lang['station_location_state_hint'] = 'Штат станции. Примени только в некоторых странах. Оставьте пустым, если неприменим.';
$lang['station_location_county'] = 'Графство';
$lang['station_location_county_hint'] = 'Графство станции (Используется только для США/Аляски/Гавайев).';
$lang['station_location_gridsquare'] = 'Квадрат';
$lang['station_location_gridsquare_hint_ln1'] = "Квадрат станции, к примеру: IO87IP. Если вы не знаете свой квадрат, то <a href='https://zone-check.eu/?m=loc' target='_blank'>кликните сюда</a>!";
$lang['station_location_gridsquare_hint_ln2'] = "Если вы располагаетесь на границе квадратов, то укажите квадраты через запятую, к примеру: IO77,IO78,IO87,IO88.";
$lang['station_location_iota_hint_ln1'] = "Референция IOTA, к примеру: EU-005";
$lang['station_location_iota_hint_ln2'] = "Вы можете посмотреть референции IOTA на сайте <a target='_blank' href='https://www.iota-world.org/iota-directory/annex-f-short-title-iota-reference-number-list.html'>IOTA World</a>.";
$lang['station_location_sota_hint_ln1'] = "Референция SOTA. Вы можете посмотреть референции SOTA на сайте <a target='_blank' href='https://www.sotamaps.org/'>SOTA Maps</a>.";
$lang['station_location_wwff_hint_ln1'] = "Референция WWFF. Вы можете посмотреть референции WWFF на сайте <a target='_blank' href='https://www.cqgma.org/mvs/'>GMA Map</a>.";
$lang['station_location_pota_hint_ln1'] = "Референция POTA. Вы можете посмотреть референции POTA на сайте <a target='_blank' href='https://pota.app/#/map/'>POTA Map</a>.";
$lang['station_location_signature'] = "Подпись";
$lang['station_location_signature_name'] = "Имя подписи";
$lang['station_location_signature_name_hint'] = "Подпись станции (т.е. GMA)..";
$lang['station_location_signature_info'] = "Информация о подписи";
$lang['station_location_signature_info_hint'] = "Информация о подписис станции (т.е. DA/NW-357).";
$lang['station_location_eqsl_hint'] = 'Название профиля, который сконфигурирован в eQSL для данного QTH';
$lang['station_location_qrz_subscription'] = 'Требуется подписка';
$lang['station_location_qrz_hint'] = "Ваш ключ API находится на <a href='https://logbook.qrz.com/logbook' target='_blank'>странице настроек журнала QRZ.com";
$lang['station_location_qrz_realtime_upload'] = 'Загрузка в журнал QRZ.com в реальном времени';
$lang['station_location_hrdlog_realtime_upload'] = "Загрузка в журнал HRDLog.net в реальном времени";
$lang['station_location_hrdlog_hint'] = "Создайте свой код к API наn <a href='http://www.hrdlog.net/EditUser.aspx' target='_blank'>странице профиля пользователя HRDLog.net";
$lang['station_location_qo100_hint'] = "Создайте свой ключ API на <a href='https://qo100dx.club' target='_blank'>странице вашего профиля в QO-100 Dx Club";
$lang['station_location_qo100_realtime_upload'] = "Загрузка QO-100 Dx Club в реальном времени";
$lang['station_location_oqrs_enabled'] = "OQRS включен";
$lang['station_location_oqrs_email_alert'] = "Оповещение о OQRS о емэйл";
$lang['station_location_oqrs_email_hint'] = "Убедитесь, что емэйл сконфигурирован администратором в общих настройках.";
$lang['station_location_oqrs_text'] = "Текст OQRS";
$lang['station_location_oqrs_text_hint'] = "Информация, которую вы хотите добавить, касающаяся QSL.";
$lang['station_location_clublog_realtime_upload']='ClubLog Realtime Upload';