diff -Nru itinerary-23.08.2/CMakeLists.txt itinerary-23.08.3/CMakeLists.txt --- itinerary-23.08.2/CMakeLists.txt 2023-10-09 15:33:21.000000000 +0000 +++ itinerary-23.08.3/CMakeLists.txt 2023-11-06 16:17:36.000000000 +0000 @@ -6,7 +6,7 @@ # KDE Application Version, managed by release script set (RELEASE_SERVICE_VERSION_MAJOR "23") set (RELEASE_SERVICE_VERSION_MINOR "08") -set (RELEASE_SERVICE_VERSION_MICRO "2") +set (RELEASE_SERVICE_VERSION_MICRO "3") set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}") project(itinerary VERSION ${RELEASE_SERVICE_VERSION}) diff -Nru itinerary-23.08.2/.craft.ini itinerary-23.08.3/.craft.ini --- itinerary-23.08.2/.craft.ini 1970-01-01 00:00:00.000000000 +0000 +++ itinerary-23.08.3/.craft.ini 2023-11-06 16:17:36.000000000 +0000 @@ -0,0 +1,5 @@ +; SPDX-FileCopyrightText: None +; SPDX-License-Identifier: CC0-1.0 + +[BlueprintSettings] +data/urw-base35-fonts.ignored=True diff -Nru itinerary-23.08.2/debian/changelog itinerary-23.08.3/debian/changelog --- itinerary-23.08.2/debian/changelog 2023-10-23 11:01:58.000000000 +0000 +++ itinerary-23.08.3/debian/changelog 2023-11-09 11:31:06.000000000 +0000 @@ -1,8 +1,14 @@ -itinerary (23.08.2-0ubuntu1~ubuntu23.10~ppa1) mantic; urgency=high +itinerary (23.08.3-0ubuntu1~ubuntu23.10~ppa1) mantic; urgency=high + + * New upstream release (23.08.3) + + -- Rik Mills Thu, 09 Nov 2023 11:31:06 +0000 + +itinerary (23.08.2-0ubuntu1) noble; urgency=medium * New upstream release (23.08.2) - -- Rik Mills Mon, 23 Oct 2023 12:01:58 +0100 + -- Rik Mills Thu, 26 Oct 2023 12:27:28 +0100 itinerary (23.08.1-0ubuntu1) mantic; urgency=medium diff -Nru itinerary-23.08.2/debian/control itinerary-23.08.3/debian/control --- itinerary-23.08.2/debian/control 2023-10-23 11:01:58.000000000 +0000 +++ itinerary-23.08.3/debian/control 2023-11-09 11:31:06.000000000 +0000 @@ -11,7 +11,7 @@ iso-codes , kirigami-addons-dev, kirigami2-dev (>= 5.94~), - kosmindoormap-dev (>= 23.08.2~), + kosmindoormap-dev (>= 23.08.3~), libical-dev (>= 3.0), libkf5archive-dev (>= 5.94~), libkf5calendarcore-dev (>= 5:5.94~), @@ -29,9 +29,9 @@ libkf5qqc2desktopstyle-dev (>= 5.94~), libkf5unitconversion-dev (>= 5.94~), libkf5windowsystem-dev (>= 5.94~), - libkpimitinerary-dev (>= 23.08.2~), - libkpimpkpass-dev (>= 23.08.2~), - libkpublictransport-dev (>= 23.08.2~), + libkpimitinerary-dev (>= 23.08.3~), + libkpimpkpass-dev (>= 23.08.3~), + libkpublictransport-dev (>= 23.08.3~), libqt5svg5-dev, libssl-dev, locales-all , diff -Nru itinerary-23.08.2/.flatpak-manifest.json itinerary-23.08.3/.flatpak-manifest.json --- itinerary-23.08.2/.flatpak-manifest.json 2023-10-09 15:33:21.000000000 +0000 +++ itinerary-23.08.3/.flatpak-manifest.json 2023-11-06 16:17:36.000000000 +0000 @@ -203,7 +203,7 @@ { "type": "git", "url": "https://invent.kde.org/libraries/kirigami-addons", - "branch": "master" + "branch": "kf5" } ] }, diff -Nru itinerary-23.08.2/.gitlab-ci.yml itinerary-23.08.3/.gitlab-ci.yml --- itinerary-23.08.2/.gitlab-ci.yml 2023-10-09 15:33:21.000000000 +0000 +++ itinerary-23.08.3/.gitlab-ci.yml 2023-11-06 16:17:36.000000000 +0000 @@ -2,14 +2,14 @@ # SPDX-License-Identifier: CC0-1.0 include: - - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android.yml - - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml - - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml - - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml - - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd-qt6.yml - - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android-qt6.yml - - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/reuse-lint.yml - - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/flatpak.yml - - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/craft-android-arm32.yml - - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/craft-android-arm64.yml - - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/craft-android-x86-64.yml + - project: sysadmin/ci-utilities + file: + - /gitlab-templates/android.yml + - /gitlab-templates/linux.yml + - /gitlab-templates/freebsd.yml + - /gitlab-templates/linux-qt6.yml + - /gitlab-templates/freebsd-qt6.yml + - /gitlab-templates/android-qt6.yml + - /gitlab-templates/reuse-lint.yml + - /gitlab-templates/flatpak.yml + - /gitlab-templates/craft-android-apks.yml diff -Nru itinerary-23.08.2/po/ca@valencia/kde-itinerary.po itinerary-23.08.3/po/ca@valencia/kde-itinerary.po --- itinerary-23.08.2/po/ca@valencia/kde-itinerary.po 2023-10-09 15:33:21.000000000 +0000 +++ itinerary-23.08.3/po/ca@valencia/kde-itinerary.po 2023-11-06 16:17:36.000000000 +0000 @@ -2876,7 +2876,7 @@ #: app/TimelinePage.qml:26 #, kde-format msgid "Go To Now" -msgstr "Ves a ara" +msgstr "Ves fins a ara" #: app/TimelinePage.qml:31 #, kde-format @@ -3337,7 +3337,7 @@ "de trànsit en línia o les previsions meteorològiques. Per tant, segurament " "voldreu revisar estos paràmetres. Quan ho feu, podreu configurar la ubicació " "de la vostra llar per a activar l'assistent de transbords i que suggerisca " -"automàticament els camins cap la propera estació d'eixida o a l'aeroport." +"automàticament els camins fins a la propera estació d'eixida o a l'aeroport." #: app/WelcomePage.qml:43 #, kde-format diff -Nru itinerary-23.08.2/po/fr/kde-itinerary.po itinerary-23.08.3/po/fr/kde-itinerary.po --- itinerary-23.08.2/po/fr/kde-itinerary.po 2023-10-09 15:33:21.000000000 +0000 +++ itinerary-23.08.3/po/fr/kde-itinerary.po 2023-11-06 16:17:36.000000000 +0000 @@ -15,7 +15,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Lokalize 23.08.1\n" +"X-Generator: Lokalize 23.08.2\n" "X-Environment: kde\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" diff -Nru itinerary-23.08.2/po/it/kde-itinerary.po itinerary-23.08.3/po/it/kde-itinerary.po --- itinerary-23.08.2/po/it/kde-itinerary.po 2023-10-09 15:33:21.000000000 +0000 +++ itinerary-23.08.3/po/it/kde-itinerary.po 2023-11-06 16:17:36.000000000 +0000 @@ -15,7 +15,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 23.08.1\n" +"X-Generator: Lokalize 23.08.2\n" #, kde-format msgctxt "NAME OF TRANSLATORS" diff -Nru itinerary-23.08.2/po/nl/kde-itinerary.po itinerary-23.08.3/po/nl/kde-itinerary.po --- itinerary-23.08.2/po/nl/kde-itinerary.po 2023-10-09 15:33:21.000000000 +0000 +++ itinerary-23.08.3/po/nl/kde-itinerary.po 2023-11-06 16:17:36.000000000 +0000 @@ -1,13 +1,13 @@ -# Copyright (C) YEAR This file is copyright: +# Copyright (C) 2023 This file is copyright: # This file is distributed under the same license as the itinerary package. # -# Freek de Kruijf , 2019, 2020, 2021, 2022, 2023. +# SPDX-FileCopyrightText: 2019, 2020, 2021, 2022, 2023 Freek de Kruijf msgid "" msgstr "" "Project-Id-Version: itinerary\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2023-10-05 02:26+0000\n" -"PO-Revision-Date: 2023-07-17 11:15+0200\n" +"PO-Revision-Date: 2023-10-20 10:05+0200\n" "Last-Translator: Freek de Kruijf \n" "Language-Team: \n" "Language: nl\n" @@ -15,7 +15,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 23.04.3\n" +"X-Generator: Lokalize 23.08.2\n" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -2255,7 +2255,7 @@ #: app/OnlineImportPage.qml:57 #, kde-format msgid "Booking reference" -msgstr "Boekingreferentie" +msgstr "Verwijzing naar boeking" #: app/OnlineImportPage.qml:63 #, kde-format diff -Nru itinerary-23.08.2/po/ru/kde-itinerary.po itinerary-23.08.3/po/ru/kde-itinerary.po --- itinerary-23.08.2/po/ru/kde-itinerary.po 2023-10-09 15:33:21.000000000 +0000 +++ itinerary-23.08.3/po/ru/kde-itinerary.po 2023-11-06 16:17:36.000000000 +0000 @@ -3,13 +3,13 @@ # # Alexander Potashev , 2019. # Alexander Yavorsky , 2021. -# Olesya Gerasimenko , 2022. +# Olesya Gerasimenko , 2022, 2023. msgid "" msgstr "" "Project-Id-Version: itinerary\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2023-10-05 02:26+0000\n" -"PO-Revision-Date: 2022-10-10 09:16+0300\n" +"PO-Revision-Date: 2023-10-31 15:16+0300\n" "Last-Translator: Olesya Gerasimenko \n" "Language-Team: Basealt Translation Team\n" "Language: ru\n" @@ -18,12 +18,12 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n" "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Lokalize 22.04.3\n" +"X-Generator: Lokalize 23.04.3\n" #, kde-format msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "Олеся Герасименко" +msgstr "Олеся Герасименко, Мария Шикунова" #, kde-format msgctxt "EMAIL OF TRANSLATORS" @@ -73,10 +73,9 @@ "следующих источников." #: app/AboutPage.qml:233 -#, fuzzy, kde-format -#| msgid "More information" +#, kde-format msgid "Developer information" -msgstr "Дополнительная информация" +msgstr "Информация для разработчиков" #: app/AboutPage.qml:238 #, kde-format @@ -89,10 +88,9 @@ msgstr "Возможности средства извлечения:" #: app/AboutPage.qml:259 -#, fuzzy, kde-format -#| msgid "Extractor capabilities:" +#, kde-format msgid "Extractor capabilities copied to clipboard" -msgstr "Возможности средства извлечения:" +msgstr "Возможности средства извлечения скопированы в буфер обмена" #: app/ActionsCard.qml:31 #, kde-format @@ -171,10 +169,9 @@ #: app/ActionsCard.qml:154 app/ProgramMembershipPage.qml:134 #: app/TicketPage.qml:153 -#, fuzzy, kde-format -#| msgid "Application" +#, kde-format msgid "Actions" -msgstr "Приложение" +msgstr "Действия" #: app/AlternativeJourneyPage.qml:20 #, kde-format @@ -192,27 +189,25 @@ #, kde-format msgctxt "journey query search constraint, title" msgid "Long distance trains" -msgstr "" +msgstr "Поезда дальнего следования" #: app/AlternativeJourneyPage.qml:91 app/DepartureQueryPage.qml:47 #: app/JourneyRequestPage.qml:208 app/TransferPage.qml:118 -#, fuzzy, kde-format -#| msgid "Location:" +#, kde-format msgctxt "journey query search constraint, title" msgid "Local trains" -msgstr "Расположение:" +msgstr "Местные поезда" #: app/AlternativeJourneyPage.qml:99 app/DepartureQueryPage.qml:54 #: app/JourneyRequestPage.qml:218 app/TransferPage.qml:126 #, kde-format msgctxt "journey query search constraint, title" msgid "Rapid transit" -msgstr "" +msgstr "Скоростной транспорт" #: app/AlternativeJourneyPage.qml:107 app/DepartureQueryPage.qml:61 #: app/JourneyRequestPage.qml:228 app/TransferPage.qml:134 -#, fuzzy, kde-format -#| msgid "Bus" +#, kde-format msgctxt "journey query search constraint, title" msgid "Bus" msgstr "Автобус" @@ -222,7 +217,7 @@ #, kde-format msgctxt "journey query search constraint, title" msgid "Ferry" -msgstr "" +msgstr "Паром" #: app/AlternativeJourneyPage.qml:131 #, kde-format @@ -268,13 +263,12 @@ msgstr "Импортирована справка о здоровье." #: app/applicationcontroller.cpp:450 -#, fuzzy, kde-format -#| msgid "Pass imported." +#, kde-format msgid "One pass imported." msgid_plural "%1 passes imported." -msgstr[0] "Пропуск импортирован." -msgstr[1] "Пропуск импортирован." -msgstr[2] "Пропуск импортирован." +msgstr[0] "%1 пропуск импортирован." +msgstr[1] "%1 пропуска импортировано." +msgstr[2] "%1 пропусков импортировано." msgstr[3] "Пропуск импортирован." #: app/applicationcontroller.cpp:453 @@ -313,10 +307,9 @@ msgstr "Сканировать штрихкод" #: app/BarcodeScannerPage.qml:26 -#, fuzzy, kde-format -#| msgid "Flight" +#, kde-format msgid "Light" -msgstr "Рейс" +msgstr "Свет" #: app/BarcodeScannerPage.qml:85 #, kde-format @@ -345,50 +338,44 @@ msgstr "Время прибытия: %1" #: app/BoatEditor.qml:17 -#, fuzzy, kde-format -#| msgid "Export Trip" +#, kde-format msgid "Edit Boat Trip" -msgstr "Экспорт поездки" +msgstr "Изменить путешествие на лодке" #: app/BoatEditor.qml:50 app/BoatPage.qml:76 -#, fuzzy, kde-format -#| msgid "Departure" +#, kde-format msgctxt "Boat departure" msgid "Departure" msgstr "Отправление" #: app/BoatEditor.qml:54 -#, fuzzy, kde-format -#| msgid "Departure Time:" +#, kde-format msgctxt "Boat departure" msgid "Departure Time" -msgstr "Время отправления:" +msgstr "Время отправления" #: app/BoatEditor.qml:61 app/BoatEditor.qml:90 -#, fuzzy, kde-format -#| msgid "Terminal:" +#, kde-format msgctxt "boat terminal" msgid "Terminal Name" -msgstr "Терминал:" +msgstr "Название терминала" #: app/BoatEditor.qml:79 app/BoatPage.qml:112 -#, fuzzy, kde-format -#| msgid "Arrival" +#, kde-format msgctxt "Boat arrival" msgid "Arrival" msgstr "Прибытие" #: app/BoatEditor.qml:83 -#, fuzzy, kde-format -#| msgid "Arrival Time:" +#, kde-format msgctxt "Boat arrival" msgid "Arrival Time" -msgstr "Время прибытия:" +msgstr "Время прибытия" #: app/BoatPage.qml:16 -#, fuzzy, kde-format +#, kde-format msgid "Boat Ticket" -msgstr "Билет на автобус" +msgstr "Билет на лодку" #: app/BoatPage.qml:21 app/BusPage.qml:33 app/EventPage.qml:21 #: app/FlightPage.qml:30 app/HealthCertificatePage.qml:42 app/PkPassPage.qml:26 @@ -399,24 +386,21 @@ #: app/BoatPage.qml:80 app/BusPage.qml:96 app/FlightPage.qml:142 #: app/TrainPage.qml:108 -#, fuzzy, kde-format -#| msgid "Departure time:" +#, kde-format msgid "Departure time" -msgstr "Время отправления:" +msgstr "Время отправления" #: app/BoatPage.qml:87 app/BoatPage.qml:123 -#, fuzzy, kde-format -#| msgid "Terminal:" +#, kde-format msgctxt "Boat terminal" msgid "Terminal" -msgstr "Терминал:" +msgstr "Терминал" #: app/BoatPage.qml:116 app/BusPage.qml:167 app/FlightPage.qml:200 #: app/TrainPage.qml:196 -#, fuzzy, kde-format -#| msgid "Arrival time:" +#, kde-format msgid "Arrival time" -msgstr "Время прибытия:" +msgstr "Время прибытия" #: app/BookingCard.qml:25 app/BusEditor.qml:175 app/FlightPage.qml:238 #: app/TrainEditor.qml:188 @@ -426,28 +410,25 @@ #: app/BookingCard.qml:30 app/BusEditor.qml:179 app/FlightPage.qml:247 #: app/TrainEditor.qml:192 -#, fuzzy, kde-format -#| msgid "Reference:" +#, kde-format msgid "Reference" -msgstr "Код бронирования:" +msgstr "Код бронирования" #: app/BookingCard.qml:39 app/BusEditor.qml:184 app/FlightPage.qml:247 #: app/TrainEditor.qml:197 -#, fuzzy, kde-format -#| msgid "Under name:" +#, kde-format msgid "Under name" -msgstr "Имя для резервирования:" +msgstr "Имя для резервирования" #: app/BookingCard.qml:48 -#, fuzzy, kde-format +#, kde-format msgid "Ticket number:" -msgstr "Порядковый номер:" +msgstr "Номер билета:" #: app/BusEditor.qml:18 -#, fuzzy, kde-format -#| msgid "Edit Hotel Reservation" +#, kde-format msgid "Edit Bus Reservation" -msgstr "Изменить бронирование гостиницы" +msgstr "Изменить бронирование автобуса" #: app/BusEditor.qml:47 app/TrainEditor.qml:50 #, kde-format @@ -455,8 +436,7 @@ msgstr "Посадка позже" #: app/BusEditor.qml:50 -#, fuzzy, kde-format -#| msgid "Change departure station" +#, kde-format msgid "Change departure stop" msgstr "Изменить станцию отправления" @@ -466,14 +446,12 @@ msgstr "Высадка раньше" #: app/BusEditor.qml:63 -#, fuzzy, kde-format -#| msgid "Change arrival station" +#, kde-format msgid "Change arrival stop" msgstr "Изменить станцию прибытия" #: app/BusEditor.qml:103 -#, fuzzy, kde-format -#| msgid "Departure" +#, kde-format msgctxt "bus departure" msgid "Departure" msgstr "Отправление" @@ -482,14 +460,13 @@ #, kde-format msgctxt "bus stop" msgid "Stop" -msgstr "" +msgstr "Остановка" #: app/BusEditor.qml:111 app/BusEditor.qml:138 -#, fuzzy, kde-format -#| msgid "Platform:" +#, kde-format msgctxt "bus stop platform" msgid "Platform" -msgstr "Платформа:" +msgstr "Платформа" #: app/BusEditor.qml:115 app/TrainEditor.qml:118 #, kde-format @@ -497,8 +474,7 @@ msgstr "Посадка позже" #: app/BusEditor.qml:130 -#, fuzzy, kde-format -#| msgid "Arrival" +#, kde-format msgctxt "bus arrival" msgid "Arrival" msgstr "Прибытие" @@ -522,36 +498,30 @@ msgstr "Билет на автобус" #: app/BusPage.qml:85 -#, fuzzy, kde-format -#| msgid "Departure" +#, kde-format msgctxt "Bus departure" msgid "Departure" msgstr "Отправление" #: app/BusPage.qml:116 app/FlightPage.qml:147 app/TrainPage.qml:137 -#, fuzzy, kde-format -#| msgctxt "flight departure gate" -#| msgid "Departure gate:" +#, kde-format msgid "Departure date" -msgstr "Выход на посадку:" +msgstr "Дата отправления" #: app/BusPage.qml:124 app/BusPage.qml:191 -#, fuzzy, kde-format -#| msgid "Station:" +#, kde-format msgctxt "bus station" msgid "Station" -msgstr "Станция:" +msgstr "Станция" #: app/BusPage.qml:132 app/BusPage.qml:199 -#, fuzzy, kde-format -#| msgid "Platform:" +#, kde-format msgctxt "bus station platform" msgid "Platform" -msgstr "Платформа:" +msgstr "Платформа" #: app/BusPage.qml:156 -#, fuzzy, kde-format -#| msgid "Arrival" +#, kde-format msgctxt "Bus arrival" msgid "Arrival" msgstr "Прибытие" @@ -584,7 +554,7 @@ #: app/CalendarImportPage.qml:66 #, kde-format msgid "No importable events found in this calendar." -msgstr "" +msgstr "В этом календаре не найдены мероприятия для импорта." #: app/CalendarSelectionSheet.qml:13 #, kde-format @@ -617,17 +587,15 @@ msgstr "Взятие" #: app/CarRentalPage.qml:31 app/CarRentalPage.qml:63 -#, fuzzy, kde-format -#| msgid "Time:" +#, kde-format msgid "Time" -msgstr "Время:" +msgstr "Время" #: app/CarRentalPage.qml:40 app/CarRentalPage.qml:72 #: app/FormPlaceDelegate.qml:32 app/HotelPage.qml:45 -#, fuzzy, kde-format -#| msgid "Location:" +#, kde-format msgid "Location" -msgstr "Расположение:" +msgstr "Расположение" #: app/CarRentalPage.qml:58 #, kde-format @@ -640,45 +608,40 @@ msgstr "Автомобиль" #: app/CarRentalPage.qml:94 -#, fuzzy, kde-format -#| msgid "Type:" +#, kde-format msgid "Type" -msgstr "Тип:" +msgstr "Тип" #: app/CarRentalPage.qml:104 -#, fuzzy, kde-format -#| msgid "Model:" +#, kde-format msgid "Model" -msgstr "Модель:" +msgstr "Модель" #: app/CarRentalPage.qml:114 -#, fuzzy, kde-format -#| msgid "Brand:" +#, kde-format msgid "Brand" -msgstr "Производитель:" +msgstr "Производитель" #: app/ContactCard.qml:22 app/ContactEditorCard.qml:31 #, kde-format msgid "Contact" -msgstr "" +msgstr "Контакт" #: app/ContactCard.qml:26 app/ContactEditorCard.qml:36 -#, fuzzy, kde-format -#| msgid "Telephone:" +#, kde-format msgid "Telephone" -msgstr "Телефон:" +msgstr "Телефон" #: app/ContactCard.qml:35 app/ContactEditorCard.qml:43 -#, fuzzy, kde-format -#| msgid "Email:" +#, kde-format msgid "Email" -msgstr "Эл. почта:" +msgstr "Эл. почта" #: app/ContactCard.qml:44 app/ContactEditorCard.qml:50 app/EventEditor.qml:116 #: app/EventPage.qml:112 #, kde-format msgid "Website" -msgstr "" +msgstr "Сайт" #: app/DepartureQueryPage.qml:21 #, kde-format @@ -710,26 +673,23 @@ msgstr "В:" #: app/DepartureQueryPage.qml:226 -#, fuzzy, kde-format -#| msgid "Earlier departure on %1" +#, kde-format msgctxt "@action:button" msgid "Load earlier departures" -msgstr "Более ранее отправление %1" +msgstr "Загрузить более ранние отправления" #: app/DepartureQueryPage.qml:235 app/JourneyQueryPage.qml:134 #: app/TransferPage.qml:331 -#, fuzzy, kde-format -#| msgid "Alternative Connections" +#, kde-format msgctxt "@action:button" msgid "Load later connections" -msgstr "Альтернативные железнодорожные маршруты" +msgstr "Загрузить поздние соединения" #: app/DepartureQueryPage.qml:247 app/JourneyQueryPage.qml:146 #: app/TransferPage.qml:343 -#, fuzzy, kde-format -#| msgid "Data providers: %1" +#, kde-format msgid "Data providers:" -msgstr "Поставщики данных: %1" +msgstr "Поставщики данных:" #: app/DocumentsCard.qml:35 #, kde-format @@ -769,7 +729,7 @@ #: app/downloadjob.cpp:102 #, kde-format msgid "Network error: %1" -msgstr "" +msgstr "Ошибка сети: %1" #: app/downloadjob.cpp:133 #, kde-format @@ -797,24 +757,21 @@ msgstr "Время окончания: %1" #: app/EventEditor.qml:18 -#, fuzzy, kde-format -#| msgid "Edit Event" +#, kde-format msgctxt "event as in concert/conference/show, not as in appointment" msgid "Edit Event" msgstr "Изменить событие" #: app/EventEditor.qml:66 -#, fuzzy, kde-format -#| msgid "Venue:" +#, kde-format msgid "Venue" -msgstr "Место:" +msgstr "Место" #: app/EventEditor.qml:70 -#, fuzzy, kde-format -#| msgid "Name:" +#, kde-format msgctxt "venue name" msgid "Name" -msgstr "Имя:" +msgstr "Название" #: app/EventEditor.qml:89 app/EventPage.qml:16 #, kde-format @@ -823,42 +780,35 @@ msgstr "Событие" #: app/EventEditor.qml:93 app/EventPage.qml:89 -#, fuzzy, kde-format -#| msgctxt "time of entrance" -#| msgid "Entrance:" +#, kde-format msgctxt "time of entrance" msgid "Entrance" -msgstr "Вход:" +msgstr "Вход" #: app/EventEditor.qml:104 app/EventPage.qml:97 app/RestaurantEditor.qml:78 -#, fuzzy, kde-format -#| msgid "Start Time:" +#, kde-format msgid "Start Time" -msgstr "Время начала:" +msgstr "Время начала" #: app/EventEditor.qml:110 app/EventPage.qml:105 app/RestaurantEditor.qml:85 -#, fuzzy, kde-format -#| msgid "End Time:" +#, kde-format msgid "End Time" -msgstr "Время окончания:" +msgstr "Время окончания" #: app/EventPage.qml:132 -#, fuzzy, kde-format -#| msgctxt "train station" -#| msgid "Station:" +#, kde-format msgctxt "seat section, e.g. block in a stadium" msgid "Section:" -msgstr "Станция:" +msgstr "Секция:" #: app/EventPage.qml:141 #, kde-format msgctxt "seat row" msgid "Row:" -msgstr "" +msgstr "Ряд:" #: app/EventPage.qml:150 -#, fuzzy, kde-format -#| msgid "Number:" +#, kde-format msgctxt "seat number" msgid "Number:" msgstr "Номер:" @@ -969,66 +919,57 @@ msgstr "Изменить рейс" #: app/FlightEditor.qml:72 -#, fuzzy, kde-format -#| msgid "Departure: %1" +#, kde-format msgctxt "flight departure" msgid "Departure - %1" -msgstr "Отправление: %1" +msgstr "Отправление — %1" #: app/FlightEditor.qml:76 app/FlightEditor.qml:121 app/FlightPage.qml:156 #: app/FlightPage.qml:209 -#, fuzzy, kde-format -#| msgid "Airport:" +#, kde-format msgid "Airport" -msgstr "Аэропорт:" +msgstr "Аэропорт" #: app/FlightEditor.qml:82 -#, fuzzy, kde-format -#| msgid "Terminal:" +#, kde-format msgctxt "flight departure terminal" msgid "Terminal" -msgstr "Терминал:" +msgstr "Терминал" #: app/FlightEditor.qml:86 -#, fuzzy, kde-format -#| msgid "Time:" +#, kde-format msgctxt "flight departure time" msgid "Time" -msgstr "Время:" +msgstr "Время" #: app/FlightEditor.qml:94 -#, fuzzy, kde-format -#| msgid "Gate:" +#, kde-format msgctxt "flight departure gate" msgid "Gate" -msgstr "Выход:" +msgstr "Выход" #: app/FlightEditor.qml:98 app/FlightPage.qml:96 -#, fuzzy, kde-format -#| msgid "Boarding time:" +#, kde-format msgid "Boarding time" -msgstr "Время посадки:" +msgstr "Время посадки" #: app/FlightEditor.qml:117 -#, fuzzy, kde-format -#| msgid "Arrival: %1" +#, kde-format msgctxt "flight arrival" msgid "Arrival - %1" -msgstr "Прибытие: %1" +msgstr "Прибытие — %1" #: app/FlightEditor.qml:127 -#, fuzzy, kde-format -#| msgid "Terminal:" +#, kde-format msgctxt "flight arrival terminal" msgid "Terminal" -msgstr "Терминал:" +msgstr "Терминал" #: app/FlightEditor.qml:131 -#, fuzzy, kde-format -#| msgid "Time:" +#, kde-format msgctxt "flight arrival time" msgid "Time" -msgstr "Время:" +msgstr "Время" #: app/FlightPage.qml:16 app/StatisticsPage.qml:118 #, kde-format @@ -1041,65 +982,56 @@ msgstr "Порядковый номер:" #: app/FlightPage.qml:90 -#, fuzzy, kde-format -#| msgid "Boarding:" +#, kde-format msgid "Boarding" -msgstr "Посадка:" +msgstr "Посадка" #: app/FlightPage.qml:105 -#, fuzzy, kde-format -#| msgid "Boarding group:" +#, kde-format msgid "Boarding group" -msgstr "Группа при посадке:" +msgstr "Группа при посадке" #: app/FlightPage.qml:122 -#, fuzzy, kde-format -#| msgid "Airline:" +#, kde-format msgid "Airline" -msgstr "Авиакомпания:" +msgstr "Авиакомпания" #: app/FlightPage.qml:137 -#, fuzzy, kde-format -#| msgid "Departure" +#, kde-format msgctxt "Flight departure" msgid "Departure" msgstr "Отправление" #: app/FlightPage.qml:164 app/FlightPage.qml:217 -#, fuzzy, kde-format -#| msgid "Terminal:" +#, kde-format msgid "Terminal" -msgstr "Терминал:" +msgstr "Терминал" #: app/FlightPage.qml:172 -#, fuzzy, kde-format -#| msgid "Gate:" +#, kde-format msgid "Gate" -msgstr "Выход:" +msgstr "Выход" #: app/FlightPage.qml:196 -#, fuzzy, kde-format -#| msgid "Arrival" +#, kde-format msgctxt "Flight arrival" msgid "Arrival" msgstr "Прибытие" #: app/FormPlaceDelegate.qml:56 -#, fuzzy, kde-format -#| msgid "Shared Bikes" +#, kde-format msgid "Share Place" -msgstr "Прокатные велосипеды" +msgstr "Поделиться местом" #: app/FormPlaceDelegate.qml:57 -#, fuzzy, kde-format -#| msgid "Do you really want to delete this ticket?" +#, kde-format msgid "Do you really want to share %1 to the Matrix channel %2?" -msgstr "Удалить этот билет?" +msgstr "Поделиться %1 на канале Matrix %2?" #: app/FormPlaceDelegate.qml:63 app/LiveStatusPage.qml:74 #, kde-format msgid "Share" -msgstr "" +msgstr "Поделиться" #: app/FormPlaceDelegate.qml:123 #, kde-format @@ -1129,42 +1061,37 @@ #, kde-format msgctxt "@action:button" msgid "Share via Matrix" -msgstr "" +msgstr "Поделиться в Matrix" #: app/FormPlaceEditorDelegate.qml:66 -#, fuzzy, kde-format -#| msgid "Street:" +#, kde-format msgid "Street" -msgstr "Улица:" +msgstr "Улица" #: app/FormPlaceEditorDelegate.qml:78 #, kde-format msgid "Invalid postal code format for this country." -msgstr "" +msgstr "Недопустимый формат почтового индекса для этой страны." #: app/FormPlaceEditorDelegate.qml:84 -#, fuzzy, kde-format -#| msgid "City:" +#, kde-format msgid "City" -msgstr "Город:" +msgstr "Город" #: app/FormPlaceEditorDelegate.qml:102 -#, fuzzy, kde-format -#| msgid "Region:" +#, kde-format msgid "Region" -msgstr "Регион:" +msgstr "Регион" #: app/FormPlaceEditorDelegate.qml:128 -#, fuzzy, kde-format -#| msgid "Country:" +#, kde-format msgid "Country" -msgstr "Страна:" +msgstr "Страна" #: app/FormPlaceEditorDelegate.qml:179 -#, fuzzy, kde-format -#| msgid "Boarding time:" +#, kde-format msgid "Coordinate" -msgstr "Время посадки:" +msgstr "Координата" #: app/FormPlaceEditorDelegate.qml:180 #, kde-format @@ -1174,24 +1101,22 @@ #: app/FormPlaceEditorDelegate.qml:180 #, kde-format msgid "Pick..." -msgstr "" +msgstr "Выбрать…" #: app/FormPlaceEditorDelegate.qml:190 #, kde-format msgid "Address to coordinate" -msgstr "" +msgstr "Определить адрес по координате" #: app/FormPlaceEditorDelegate.qml:204 -#, fuzzy, kde-format -#| msgid "Boarding time:" +#, kde-format msgid "Coordinate to address" -msgstr "Время посадки:" +msgstr "Определить координату по адресу" #: app/FormPlatformDelegate.qml:15 -#, fuzzy, kde-format -#| msgid "Platform:" +#, kde-format msgid "Platform" -msgstr "Платформа:" +msgstr "Платформа" #: app/FormPlatformDelegate.qml:43 #, kde-format @@ -1230,26 +1155,24 @@ msgstr "Автобус %1 из %2 в %3" #: app/gpxexport.cpp:58 -#, fuzzy, kde-format +#, kde-format msgid "Ferry from %1 to %2" -msgstr "Отправление из %1: %2" +msgstr "Отправление из %1 в %2" #: app/HealthCertificateBarcode.qml:34 -#, fuzzy, kde-format -#| msgid "Vaccination (%1)" +#, kde-format msgid "Vaccination certificate of %1" -msgstr "Вакцинация (%1)" +msgstr "Прививочный сертификат %1" #: app/HealthCertificateBarcode.qml:36 -#, fuzzy, kde-format -#| msgid "Delete Certificate" +#, kde-format msgid "Test certificate of %1" -msgstr "Удалить сертификат" +msgstr "Сертификат теста %1" #: app/HealthCertificateBarcode.qml:38 #, kde-format msgid "Recovery certificate of %1" -msgstr "" +msgstr "Сертификат выздоровления %1" #: app/HealthCertificateBarcode.qml:53 #, kde-format @@ -1264,52 +1187,47 @@ #: app/HealthCertificateBarcode.qml:59 #, kde-format msgid "Unknown issuer certificate" -msgstr "" +msgstr "Неизвестный центр выдачи сертификата" #: app/HealthCertificateBarcode.qml:65 #, kde-format msgid "Recently vaccinated" -msgstr "" +msgstr "Недавно вакцинированный" #: app/HealthCertificateBarcode.qml:66 #, kde-format msgid "Partially vaccinated" -msgstr "" +msgstr "Частично вакцинированный" #: app/HealthCertificateBarcode.qml:67 -#, fuzzy, kde-format -#| msgid "Vaccine:" +#, kde-format msgid "Vaccinated" -msgstr "Вакцина:" +msgstr "Вакцинированный" #: app/HealthCertificateBarcode.qml:68 #, kde-format msgid "Fully vaccinated" -msgstr "" +msgstr "Полностью вакцинированный" #: app/HealthCertificateBarcode.qml:74 -#, fuzzy, kde-format -#| msgid "Positive test:" +#, kde-format msgid "Negative test" -msgstr "Положительный тест:" +msgstr "Отрицательный тест" #: app/HealthCertificateBarcode.qml:75 -#, fuzzy, kde-format -#| msgid "Positive test:" +#, kde-format msgid "Positive test" -msgstr "Положительный тест:" +msgstr "Положительный тест" #: app/HealthCertificateBarcode.qml:78 -#, fuzzy, kde-format -#| msgid "Certificate expired" +#, kde-format msgid "Test expired" -msgstr "Сертификат истёк" +msgstr "Тест истёк" #: app/HealthCertificateBarcode.qml:80 -#, fuzzy, kde-format -#| msgid "Certificate invalid" +#, kde-format msgid "Recovery certificate valid" -msgstr "Сертификат недействителен" +msgstr "Сертификат выздоровления действителен" #: app/healthcertificatemanager.cpp:118 #, kde-format @@ -1538,28 +1456,25 @@ #: app/HotelEditor.qml:49 #, kde-format msgid "Hotel" -msgstr "" +msgstr "Гостиница" #: app/HotelEditor.qml:54 -#, fuzzy, kde-format -#| msgid "Name:" +#, kde-format msgctxt "hotel name" msgid "Name" -msgstr "Имя:" +msgstr "Название" #: app/HotelEditor.qml:80 -#, fuzzy, kde-format -#| msgid "Check-in" +#, kde-format msgctxt "hotel checkin" msgid "Check-in" -msgstr "Регистрация" +msgstr "Заезд" #: app/HotelEditor.qml:87 -#, fuzzy, kde-format -#| msgid "Check-out %1" +#, kde-format msgctxt "hotel checkout" msgid "Check-out" -msgstr "Регистрация отъезда %1" +msgstr "Выезд" #: app/HotelPage.qml:16 #, kde-format @@ -1567,16 +1482,14 @@ msgstr "Бронирование гостиницы" #: app/HotelPage.qml:69 -#, fuzzy, kde-format -#| msgid "Check-in time:" +#, kde-format msgid "Check-in time" -msgstr "Время регистрации:" +msgstr "Время регистрации" #: app/HotelPage.qml:76 -#, fuzzy, kde-format -#| msgid "Check-out time:" +#, kde-format msgid "Check-out time" -msgstr "Время регистрации отъезда:" +msgstr "Время регистрации отъезда" #: app/IndoorMapGateSheet.qml:18 app/IndoorMapPage.qml:96 #, kde-format @@ -1707,11 +1620,10 @@ msgstr "Выбрать" #: app/JourneyQueryPage.qml:125 app/TransferPage.qml:322 -#, fuzzy, kde-format -#| msgid "Alternative Connections" +#, kde-format msgctxt "@action:button" msgid "Load earlier connections" -msgstr "Альтернативные железнодорожные маршруты" +msgstr "Загрузить ранние соединения" #: app/JourneyRequestPage.qml:31 app/JourneyRequestPage.qml:58 #, kde-format @@ -1757,32 +1669,31 @@ #, kde-format msgctxt "journey query search constraint, description" msgid "High speed or intercity trains" -msgstr "" +msgstr "Высокоскоростные или междугородные поезда" #: app/JourneyRequestPage.qml:209 -#, fuzzy, kde-format -#| msgid "Rename favorite location" +#, kde-format msgctxt "journey query search constraint, description" msgid "Regional or local trains" -msgstr "Переименовать избранное расположение" +msgstr "Региональные или местные поезда" #: app/JourneyRequestPage.qml:219 #, kde-format msgctxt "journey query search constraint, description" msgid "Rapid transit, metro, trams" -msgstr "" +msgstr "Скоростной транспорт, метро, трамваи" #: app/JourneyRequestPage.qml:229 #, kde-format msgctxt "journey query search constraint, description" msgid "Local or regional bus services" -msgstr "" +msgstr "Службы местных или региональных автобусов" #: app/JourneyRequestPage.qml:239 #, kde-format msgctxt "journey query search constraint, description" msgid "Boats or ferries" -msgstr "" +msgstr "Лодки или паромы" #: app/JourneySectionDelegate.qml:99 #, kde-format @@ -1835,40 +1746,38 @@ msgstr "Расстояние: %1" #: app/JourneySectionPage.qml:68 -#, fuzzy, kde-format -#| msgid "CO₂: %1g" +#, kde-format msgid "CO₂: %1" -msgstr "CO₂: %1 г" +msgstr "CO₂: %1" #: app/JourneySectionPage.qml:107 #, kde-format msgctxt "@action:button" msgid "Show More…" -msgstr "" +msgstr "Показать больше…" #: app/JourneySectionStopDelegate.qml:153 #, kde-format msgctxt "Abreviation of train platform" msgid "Pl. %1" -msgstr "" +msgstr "Пл. %1" #: app/JourneySectionStopDelegate.qml:155 #, kde-format msgctxt "Ferry dock, if possible use an abreviation" msgid "Dock %1" -msgstr "" +msgstr "Док %1" #: app/JourneySectionStopDelegate.qml:157 #, kde-format msgctxt "Generic abreviation of platform" msgid "Pl. %1" -msgstr "" +msgstr "Пл. %1" #: app/JourneySectionStopDelegate.qml:171 -#, fuzzy, kde-format -#| msgid "Location:" +#, kde-format msgid "Show location" -msgstr "Расположение:" +msgstr "Показать местоположение" #: app/JourneySummaryDelegate.qml:57 #, kde-format @@ -1883,13 +1792,12 @@ #: app/JourneySummaryDelegate.qml:68 #, kde-format msgid "Click to extend" -msgstr "" +msgstr "Нажмите для расширения" #: app/livedatamanager.cpp:668 -#, fuzzy, kde-format -#| msgid "Flight %1 from %2 to %3" +#, kde-format msgid "Flight %1 to %2:" -msgstr "Рейс %1 из %2 в %3" +msgstr "Рейс из %1 в %2:" #: app/livedatamanager.cpp:674 #, kde-format @@ -1899,55 +1807,48 @@ #: app/LiveStatusPage.qml:17 app/main.qml:207 #, kde-format msgid "Live Status" -msgstr "" +msgstr "Состояние в реальном времени" #: app/LiveStatusPage.qml:26 #, kde-format msgid "Stop Location Sharing" -msgstr "" +msgstr "Прекратить делиться местоположением" #: app/LiveStatusPage.qml:26 #, kde-format msgid "Share Location via Matrix" -msgstr "" +msgstr "Делиться местоположением через Matrix" #: app/LiveStatusPage.qml:67 -#, fuzzy, kde-format -#| msgid "Favorite Locations" +#, kde-format msgid "Share Live Location" -msgstr "Избранные расположения" +msgstr "Поделиться местоположением в реальном времени" #: app/LiveStatusPage.qml:68 -#, fuzzy, kde-format -#| msgid "" -#| "Do you really want to replace your existing reservation with the newly " -#| "selected journey?" +#, kde-format msgid "" "Do you really want to share your current location to the Matrix channel %1?" -msgstr "Заменить существующее бронирование на только что выбранную поездку?" +msgstr "Поделиться текущим местоположением через канал Matrix %1?" #: app/LiveStatusPage.qml:163 -#, fuzzy, kde-format -#| msgid "Automatically fill transfers" +#, kde-format msgid "Automatically follow on the map" -msgstr "Автоматически заполнять пересадки" +msgstr "Автоматически следовать по карте" #: app/LiveStatusPage.qml:182 app/LiveStatusPage.qml:193 #, kde-format msgid "Waiting for data..." -msgstr "" +msgstr "Ожидание данных..." #: app/LiveStatusPage.qml:205 -#, fuzzy, kde-format -#| msgid "Location:" +#, kde-format msgid "Position" -msgstr "Расположение:" +msgstr "Позиция" #: app/LiveStatusPage.qml:214 -#, fuzzy, kde-format -#| msgid "Select Journey" +#, kde-format msgid "Journey" -msgstr "Выбрать поездку" +msgstr "Путешествие" #: app/localizer.cpp:180 #, kde-format @@ -1956,42 +1857,37 @@ msgstr "dd MMMM" #: app/localizer.cpp:225 -#, fuzzy, kde-format -#| msgid "☂ %1 mm" +#, kde-format msgctxt "distance in meter" msgid "%1 m" -msgstr "☂ %1 мм" +msgstr "%1 м" #: app/localizer.cpp:228 app/localizer.cpp:230 -#, fuzzy, kde-format -#| msgid "%1 km" +#, kde-format msgctxt "distance in kilometer" msgid "%1 km" msgstr "%1 км" #: app/localizer.cpp:236 -#, fuzzy, kde-format -#| msgid "%1km" +#, kde-format msgctxt "speed in kilometers per hour" msgid "%1 km/h" -msgstr "%1 км" +msgstr "%1 км/ч" #: app/localizer.cpp:242 #, kde-format msgctxt "weight in gram" msgid "%1 g" -msgstr "" +msgstr "%1 г" #: app/localizer.cpp:245 app/localizer.cpp:247 -#, fuzzy, kde-format -#| msgid "%1 kg" +#, kde-format msgctxt "weight in kilogram" msgid "%1 kg" msgstr "%1 кг" #: app/localizer.cpp:253 -#, fuzzy, kde-format -#| msgid "%1°C" +#, kde-format msgctxt "temperature" msgid "%1°C" msgstr "%1°C" @@ -2122,15 +2018,14 @@ msgstr "Файл PkPass или JSON-LD для импорта." #: app/main.qml:57 -#, fuzzy, kde-format -#| msgid "Import..." +#, kde-format msgid "Import" -msgstr "Импорт…" +msgstr "Импорт" #: app/main.qml:60 #, kde-format msgid "Open File..." -msgstr "" +msgstr "Открыть файл..." #: app/main.qml:68 #, kde-format @@ -2143,20 +2038,19 @@ msgstr "Сканировать штрихкод..." #: app/main.qml:86 -#, fuzzy, kde-format -#| msgid "Add from calendar..." +#, kde-format msgid "Add from Calendar..." -msgstr "Добавить из календаря..." +msgstr "Добавить из календаря…" #: app/main.qml:101 #, kde-format msgid "Deutsche Bahn Online Ticket..." -msgstr "" +msgstr "Онлайн-билет Deutsche Bahn…" #: app/main.qml:109 #, kde-format msgid "SNCF Online Ticket..." -msgstr "" +msgstr "Онлайн-билет SNCF…" #: app/main.qml:122 #, kde-format @@ -2234,47 +2128,45 @@ msgstr "Загрузка карты завершена." #: app/MatrixRoomSelectionSheet.qml:18 -#, fuzzy, kde-format -#| msgid "Favorite Locations" +#, kde-format msgid "Share Location" -msgstr "Избранные расположения" +msgstr "Поделиться местоположением" #: app/MatrixRoomSelectionSheet.qml:32 #, kde-format msgctxt "matrix room type" msgid "Invited" -msgstr "" +msgstr "Приглашённые" #: app/MatrixRoomSelectionSheet.qml:33 -#, fuzzy, kde-format -#| msgid "Favorite Locations" +#, kde-format msgctxt "matrix room type" msgid "Favorite Rooms" -msgstr "Избранные расположения" +msgstr "Избранные комнаты" #: app/MatrixRoomSelectionSheet.qml:34 #, kde-format msgctxt "matrix room type" msgid "Direct Messages" -msgstr "" +msgstr "Личные сообщения" #: app/MatrixRoomSelectionSheet.qml:35 #, kde-format msgctxt "matrix room type" msgid "Rooms" -msgstr "" +msgstr "Комнаты" #: app/MatrixRoomSelectionSheet.qml:36 #, kde-format msgctxt "matrix room type" msgid "Low Priority" -msgstr "" +msgstr "Низкий приоритет" #: app/MatrixRoomSelectionSheet.qml:37 #, kde-format msgctxt "matrix room type" msgid "Spaces" -msgstr "" +msgstr "Пространства" #: app/notificationhelper.cpp:62 #, kde-format @@ -2349,44 +2241,39 @@ msgstr "Новая платформа прибытия: %1" #: app/OnlineImportPage.qml:16 -#, fuzzy, kde-format -#| msgid "Train Ticket" +#, kde-format msgid "Import Online Ticket" -msgstr "Билет на поезд" +msgstr "Импортировать онлайн-билет" #: app/OnlineImportPage.qml:26 -#, fuzzy, kde-format -#| msgid "Nothing imported." +#, kde-format msgid "Ticket imported" -msgstr "Ничего не импортировано." +msgstr "Билет импортирован" #: app/OnlineImportPage.qml:30 -#, fuzzy, kde-format -#| msgid "No locations found" +#, kde-format msgid "No ticket found" -msgstr "Расположения не найдены" +msgstr "Билеты не найдены" #: app/OnlineImportPage.qml:45 -#, fuzzy, kde-format -#| msgid "Train Ticket" +#, kde-format msgid "Online Ticket" -msgstr "Билет на поезд" +msgstr "Онлайн-билет" #: app/OnlineImportPage.qml:49 #, kde-format msgid "Family name" -msgstr "" +msgstr "Фамилия" #: app/OnlineImportPage.qml:57 -#, fuzzy, kde-format -#| msgid "Booking reference:" +#, kde-format msgid "Booking reference" -msgstr "Код бронирования:" +msgstr "Код бронирования" #: app/OnlineImportPage.qml:63 #, kde-format msgid "Search..." -msgstr "" +msgstr "Поиск…" #: app/passmanager.cpp:246 #, kde-format @@ -2398,7 +2285,7 @@ #, kde-format msgctxt "not yet valid tickets" msgid "Future" -msgstr "" +msgstr "Будущие" #: app/passmanager.cpp:251 #, kde-format @@ -2407,11 +2294,9 @@ msgstr "Действительные" #: app/passmanager.cpp:270 -#, fuzzy, kde-format -#| msgctxt "name - number" -#| msgid "%1 - %2" +#, kde-format msgid "%1 - %2" -msgstr "%1 - %2" +msgstr "%1 — %2" #: app/PassPage.qml:17 #, kde-format @@ -2425,12 +2310,10 @@ msgstr "%1 - %2" #: app/PassPage.qml:71 -#, fuzzy, kde-format -#| msgctxt "name - number" -#| msgid "%1 - %2" +#, kde-format msgctxt "name - valid time range" msgid "%1 - %2" -msgstr "%1 - %2" +msgstr "%1 — %2" #: app/PassPage.qml:92 #, kde-format @@ -2466,23 +2349,20 @@ msgstr "Программа" #: app/ProgramMembershipCard.qml:27 app/TicketPage.qml:108 -#, fuzzy, kde-format -#| msgid "Name:" +#, kde-format msgid "Name" -msgstr "Имя:" +msgstr "Имя" #: app/ProgramMembershipCard.qml:36 app/ProgramMembershipPage.qml:100 #: app/TicketPage.qml:126 -#, fuzzy, kde-format -#| msgid "Number:" +#, kde-format msgid "Number" -msgstr "Номер:" +msgstr "Номер" #: app/ProgramMembershipCard.qml:45 -#, fuzzy, kde-format -#| msgid "Show Boarding Pass" +#, kde-format msgid "Show program pass" -msgstr "Показать посадочный талон" +msgstr "Показать пароль программы" #: app/ProgramMembershipPage.qml:17 #, kde-format @@ -2495,54 +2375,49 @@ msgstr "Участник" #: app/ProgramMembershipPage.qml:108 app/TicketPage.qml:114 -#, fuzzy, kde-format -#| msgid "Valid from:" +#, kde-format msgid "Valid from" -msgstr "Действует с:" +msgstr "Действует с" #: app/ProgramMembershipPage.qml:113 app/TicketPage.qml:120 -#, fuzzy, kde-format -#| msgid "Valid until:" +#, kde-format msgid "Valid until" -msgstr "Действует до:" +msgstr "Действует до" #: app/publictransport.cpp:225 app/publictransport.cpp:252 -#, fuzzy, kde-format -#| msgid "Walk (%1)" +#, kde-format msgid "Walk" -msgstr "Переход (%1)" +msgstr "Переход" #: app/publictransport.cpp:227 -#, fuzzy, kde-format -#| msgid "Wait (%1)" +#, kde-format msgid "Wait" -msgstr "Ожидание (%1)" +msgstr "Ожидание" #: app/publictransport.cpp:236 #, kde-format msgid "Rented bicycle" -msgstr "" +msgstr "Арендованный велосипед" #: app/publictransport.cpp:238 #, kde-format msgid "Rented moped" -msgstr "" +msgstr "Арендованный мопед" #: app/publictransport.cpp:240 #, kde-format msgid "Rented kick scooter" -msgstr "" +msgstr "Арендованный самокат" #: app/publictransport.cpp:242 -#, fuzzy, kde-format -#| msgid "Rental Car" +#, kde-format msgid "Rented car" -msgstr "Прокатный автомобиль" +msgstr "Арендованный автомобиль" #: app/publictransport.cpp:248 #, kde-format msgid "Bicycle" -msgstr "" +msgstr "Велосипед" #: app/publictransport.cpp:250 app/StatisticsPage.qml:195 #, kde-format @@ -2565,10 +2440,9 @@ msgstr "🇪🇺 Европейский союз" #: app/ReservationDocumentsCard.qml:20 -#, fuzzy, kde-format -#| msgid "Current Ticket" +#, kde-format msgid "Documents and Tickets" -msgstr "Текущий билет" +msgstr "Документы и билеты" #: app/RestaurantEditor.qml:18 #, kde-format @@ -2576,17 +2450,15 @@ msgstr "Изменить ресторан" #: app/RestaurantEditor.qml:49 -#, fuzzy, kde-format -#| msgid "Edit Restaurant" +#, kde-format msgid "Restaurant" -msgstr "Изменить ресторан" +msgstr "Ресторан" #: app/RestaurantEditor.qml:54 -#, fuzzy, kde-format -#| msgid "Name:" +#, kde-format msgctxt "restaurant name" msgid "Name" -msgstr "Имя:" +msgstr "Название" #: app/RestaurantEditor.qml:73 #, kde-format @@ -2599,22 +2471,19 @@ msgstr "Бронирование ресторана" #: app/RestaurantPage.qml:63 -#, fuzzy, kde-format -#| msgid "Start time:" +#, kde-format msgid "Start time" -msgstr "Время начала:" +msgstr "Время начала" #: app/RestaurantPage.qml:71 -#, fuzzy, kde-format -#| msgid "End time:" +#, kde-format msgid "End time" -msgstr "Время завершения:" +msgstr "Время завершения" #: app/RestaurantPage.qml:79 -#, fuzzy, kde-format -#| msgid "Party size:" +#, kde-format msgid "Party size" -msgstr "Количество гостей:" +msgstr "Количество гостей" #: app/SettingsPage.qml:18 #, kde-format @@ -2762,54 +2631,56 @@ #: app/SettingsPage.qml:218 #, kde-format msgid "Onboard Status" -msgstr "" +msgstr "Статус посадки" #: app/SettingsPage.qml:222 #, kde-format msgid "Request permissions..." -msgstr "" +msgstr "Запрос прав доступа..." #: app/SettingsPage.qml:223 #, kde-format msgid "Additional permissions are required to access the Wi-Fi status." -msgstr "" +msgstr "Для доступа к статусу Wi-Fi требуются дополнительные права доступа." #: app/SettingsPage.qml:235 -#, fuzzy, kde-format -#| msgid "No vehicle layout information available." +#, kde-format msgid "Wi-Fi access for onboard information is available." -msgstr "Сведения о схеме транспортного средства недоступны." +msgstr "Подключение к Wi-Fi для получения информации о посадке недоступно." #: app/SettingsPage.qml:237 #, kde-format msgid "Wi-Fi is not enabled" -msgstr "" +msgstr "Wi-Fi отключён" #: app/SettingsPage.qml:239 #, kde-format msgid "Location service is not enabled" -msgstr "" +msgstr "Служба местоположения не включена" #: app/SettingsPage.qml:241 #, kde-format msgid "Wi-Fi access is not available on this system" -msgstr "" +msgstr "В системе недоступно подключение к Wi-Fi" #: app/SettingsPage.qml:248 #, kde-format msgid "No further action required." -msgstr "" +msgstr "Дальнейшие действия не требуются." #: app/SettingsPage.qml:250 #, kde-format msgid "Enable Wi-Fi on your system to access onboard information." msgstr "" +"Включите Wi-Fi на своей системе для получения доступа к информации о посадке." #: app/SettingsPage.qml:252 #, kde-format msgid "" "Enable the location service on your device to access onboard information." msgstr "" +"Включите службу определения местоположения на устройстве, чтобы получить " +"доступ к информации о посадке." #: app/SettingsPage.qml:254 #, kde-format @@ -2817,42 +2688,43 @@ "Onboard information are unfortunately not supported on your device at this " "time." msgstr "" +"В настоящий момент информация о посадке не поддерживается на данном " +"устройстве." #: app/SettingsPage.qml:292 #, kde-format msgid "Matrix Integration" -msgstr "" +msgstr "Интеграция с Matrix" #: app/SettingsPage.qml:293 #, kde-format msgid "Logged in as %1" -msgstr "" +msgstr "Вход выполнен: %1" #: app/SettingsPage.qml:296 #, kde-format msgid "Synchronize rooms" -msgstr "" +msgstr "Синхронизировать комнаты" #: app/SettingsPage.qml:303 #, kde-format msgid "Matrix ID" -msgstr "" +msgstr "Matrix ID" #: app/SettingsPage.qml:310 -#, fuzzy, kde-format -#| msgid "Pass" +#, kde-format msgid "Password" -msgstr "Пропуск" +msgstr "Пароль" #: app/SettingsPage.qml:317 #, kde-format msgid "Log out" -msgstr "" +msgstr "Завершить сеанс" #: app/SettingsPage.qml:317 #, kde-format msgid "Log in" -msgstr "" +msgstr "Войти" #: app/statisticsmodel.cpp:91 #, kde-format @@ -2906,13 +2778,12 @@ #: app/statisticsmodel.cpp:184 #, kde-format msgid "Boat trips" -msgstr "" +msgstr "Путешествия на лодке" #: app/StatisticsPage.qml:44 -#, fuzzy, kde-format -#| msgid "Years" +#, kde-format msgid "Year" -msgstr "Годы" +msgstr "Год" #: app/StatisticsPage.qml:64 app/statisticstimerangemodel.cpp:69 #, kde-format @@ -2920,15 +2791,14 @@ msgstr "Всего" #: app/StatisticsPage.qml:138 -#, fuzzy, kde-format -#| msgid "Trains" +#, kde-format msgid "Train" -msgstr "Поезда" +msgstr "Железная дорога" #: app/StatisticsPage.qml:176 #, kde-format msgid "Boat" -msgstr "" +msgstr "Лодка" #: app/StopPickerPage.qml:29 #, kde-format @@ -2961,10 +2831,9 @@ msgstr "Расположения не найдены" #: app/TicketEditor.qml:17 -#, fuzzy, kde-format -#| msgid "Event Ticket" +#, kde-format msgid "Edit Ticket" -msgstr "Билет на событие" +msgstr "Изменить билет" #: app/TicketEditor.qml:45 app/TicketPage.qml:17 app/TicketPage.qml:104 #, kde-format @@ -2972,14 +2841,14 @@ msgstr "Билет" #: app/TicketEditor.qml:50 -#, fuzzy, kde-format +#, kde-format msgid "Ticket name" -msgstr "Порядковый номер:" +msgstr "Название билета" #: app/TicketEditor.qml:53 #, kde-format msgid "Ticket name must not be empty." -msgstr "" +msgstr "Название билета не должно быть пустым." #: app/TicketPage.qml:42 #, kde-format @@ -2992,10 +2861,9 @@ msgstr "Удалить этот билет?" #: app/TicketPage.qml:132 -#, fuzzy, kde-format -#| msgid "Class:" +#, kde-format msgid "Class" -msgstr "Класс:" +msgstr "Класс" #: app/tickettokenmodel.cpp:74 #, kde-format @@ -3069,10 +2937,9 @@ msgstr "Отправление" #: app/TouristAttractionPage.qml:63 -#, fuzzy, kde-format -#| msgid "Departure Time:" +#, kde-format msgid "Depature Time" -msgstr "Время отправления:" +msgstr "Время отправления" #: app/TouristAttractionPage.qml:77 #, kde-format @@ -3080,39 +2947,33 @@ msgstr "Прибытие" #: app/TouristAttractionPage.qml:81 -#, fuzzy, kde-format -#| msgid "Arrival Time:" +#, kde-format msgid "Arrival Time" -msgstr "Время прибытия:" +msgstr "Время прибытия" #: app/TrainDelegate.qml:60 -#, fuzzy, kde-format -#| msgid "Departure from %1 on platform %2" +#, kde-format msgctxt "Train departure" msgid "Departure from %1 on platform %2" -msgstr "Отправление из %1, платформа %2" +msgstr "Отправление c %1, платформа %2" #: app/TrainDelegate.qml:62 -#, fuzzy, kde-format -#| msgctxt "flight departure, %1 is airport, %2 is time" -#| msgid "Departure from %1: %2" +#, kde-format msgctxt "Train departure" msgid "Departure from %1" -msgstr "Отправление из %1: %2" +msgstr "Отправление c %1" #: app/TrainDelegate.qml:94 -#, fuzzy, kde-format -#| msgid "Arrival at %1 on platform %2" +#, kde-format msgctxt "Train arrival" msgid "Arrival at %1 on platform %2" msgstr "Прибытие в %1, платформа %2" #: app/TrainDelegate.qml:96 -#, fuzzy, kde-format -#| msgid "Arrival: %1" +#, kde-format msgctxt "Train arrival" msgid "Arrival at %1" -msgstr "Прибытие: %1" +msgstr "Прибытие в %1" #: app/TrainEditor.qml:19 #, kde-format @@ -3130,47 +2991,41 @@ msgstr "Изменить станцию прибытия" #: app/TrainEditor.qml:106 -#, fuzzy, kde-format -#| msgid "Departure" +#, kde-format msgctxt "train departure" msgid "Departure" msgstr "Отправление" #: app/TrainEditor.qml:109 app/TrainEditor.qml:136 app/TrainPage.qml:145 #: app/TrainPage.qml:230 -#, fuzzy, kde-format -#| msgid "Station:" +#, kde-format msgctxt "train station" msgid "Station" -msgstr "Станция:" +msgstr "Станция" #: app/TrainEditor.qml:114 app/TrainEditor.qml:141 -#, fuzzy, kde-format -#| msgid "Platform:" +#, kde-format msgctxt "train platform" msgid "Platform" -msgstr "Платформа:" +msgstr "Платформа" #: app/TrainEditor.qml:133 -#, fuzzy, kde-format -#| msgid "Arrival" +#, kde-format msgctxt "train arrival" msgid "Arrival" msgstr "Прибытие" #: app/TrainEditor.qml:165 -#, fuzzy, kde-format -#| msgid "Coach:" +#, kde-format msgctxt "carriage on a train" msgid "Coach" -msgstr "Вагон:" +msgstr "Вагон" #: app/TrainEditor.qml:175 -#, fuzzy, kde-format -#| msgid "Class:" +#, kde-format msgctxt "seating class on a train" msgid "Class" -msgstr "Класс:" +msgstr "Класс" #: app/TrainPage.qml:17 #, kde-format @@ -3178,8 +3033,7 @@ msgstr "Билет на поезд" #: app/TrainPage.qml:104 -#, fuzzy, kde-format -#| msgid "Departure" +#, kde-format msgctxt "Train departure" msgid "Departure" msgstr "Отправление" @@ -3187,11 +3041,10 @@ #: app/TrainPage.qml:173 app/TrainPage.qml:257 #, kde-format msgid "Additional notes" -msgstr "" +msgstr "Дополнительные заметки" #: app/TrainPage.qml:191 -#, fuzzy, kde-format -#| msgid "Arrival" +#, kde-format msgctxt "Train arrival" msgid "Arrival" msgstr "Прибытие" @@ -3223,16 +3076,14 @@ msgstr "Схема транспортного средства прибытия" #: app/TransferDelegate.qml:121 -#, fuzzy, kde-format -#| msgid "Select Transfer" +#, kde-format msgid "Select transfer" msgstr "Выбрать пересадку" #: app/TransferDelegate.qml:135 -#, fuzzy, kde-format -#| msgid "Select Transfer" +#, kde-format msgid "Delete transfer" -msgstr "Выбрать пересадку" +msgstr "Удалить пересадку" #: app/TransferPage.qml:21 #, kde-format @@ -3305,11 +3156,10 @@ #: app/TripGroupDelegate.qml:104 app/WeatherForecastDelegate.qml:54 #: app/WeatherForecastPage.qml:94 -#, fuzzy, kde-format -#| msgid "%1°C / %2°C" +#, kde-format msgctxt "temperature range" msgid "%1 / %2" -msgstr "%1°C / %2°C" +msgstr "%1 / %2" #: app/TripGroupDelegate.qml:119 #, kde-format @@ -3336,27 +3186,23 @@ msgstr[3] "Валюта: %2" #: app/TripGroupDelegate.qml:157 -#, fuzzy, kde-format -#| msgid "Export to GPX" +#, kde-format msgid "Export trip to GPX" -msgstr "Экспорт в GPX" +msgstr "Экспорт поездки в GPX" #: app/TripGroupDelegate.qml:165 -#, fuzzy, kde-format -#| msgid "Delete Trip" +#, kde-format msgid "Delete trip" msgstr "Удалить поездку" #: app/tripgroupmanager.cpp:594 -#, fuzzy, kde-format -#| msgid "%1 (%2 %3)" +#, kde-format msgctxt "%1 is destination, %2 is the standalone month name, %3 is the year" msgid "%1 (%2 %3)" msgstr "%1 (%2 %3)" #: app/tripgroupmanager.cpp:596 -#, fuzzy, kde-format -#| msgid "%1 (%2/%3 %4)" +#, kde-format msgctxt "" "%1 is destination, %2 and %3 are the standalone month names and %4 is the " "year" @@ -3364,8 +3210,7 @@ msgstr "%1 (%2/%3 %4)" #: app/tripgroupmanager.cpp:598 -#, fuzzy, kde-format -#| msgid "%1 (%2/%3)" +#, kde-format msgctxt "%1 is destination, %2 and %3 are years" msgid "%1 (%2/%3)" msgstr "%1 (%2/%3)" @@ -3421,8 +3266,7 @@ msgstr "Сведения о схеме транспортного средства недоступны." #: app/VehicleLoadIndicator.qml:29 -#, fuzzy, kde-format -#| msgid "FULL" +#, kde-format msgctxt "vehicle load" msgid "FULL" msgstr "ПОЛНЫЙ" @@ -3431,33 +3275,31 @@ #, kde-format msgctxt "vehicle load" msgid "Low" -msgstr "" +msgstr "Низкая" #: app/VehicleLoadIndicator.qml:53 #, kde-format msgctxt "vehicle load" msgid "Medium" -msgstr "" +msgstr "Средняя" #: app/VehicleLoadIndicator.qml:54 #, kde-format msgctxt "vehicle load" msgid "High" -msgstr "" +msgstr "Высокая" #: app/WeatherForecastDelegate.qml:67 app/WeatherForecastPage.qml:107 -#, fuzzy, kde-format -#| msgid "☂ %1 mm" +#, kde-format msgctxt "precipitation" msgid "%1 mm" -msgstr "☂ %1 мм" +msgstr "%1 мм" #: app/WeatherForecastDelegate.qml:80 app/WeatherForecastPage.qml:120 -#, fuzzy, kde-format -#| msgid "☂ %1 mm" +#, kde-format msgctxt "windSpeed" msgid "%1 m/s" -msgstr "☂ %1 мм" +msgstr "%1 м/с" #: app/WelcomePage.qml:17 #, kde-format @@ -3531,17 +3373,17 @@ #: matrix/matrixmanager.cpp:110 #, kde-format msgid "Syncing…" -msgstr "" +msgstr "Выполняется синхронизация…" #: matrix/matrixmanager.cpp:43 #, kde-format msgid "This server does not support logging in using a password" -msgstr "" +msgstr "Сервер не поддерживает вход по паролю" #: matrix/matrixmanager.cpp:69 #, kde-format msgid "Logging in" -msgstr "" +msgstr "Вход в систему" #: metadataextractor/itineraryextractor.cpp:120 #, kde-format @@ -3568,17 +3410,13 @@ #~ msgstr "Выбрать пересадку…" #, fuzzy -#~| msgid "Departure Time:" #~ msgctxt "Boat departure" #~ msgid "Deparutre Time" -#~ msgstr "Время отправления:" +#~ msgstr "Время отправления" #~ msgid "Frequent Traveler Program" #~ msgstr "Программа для лиц, которые часто путешествуют" -#, fuzzy -#~| msgctxt "bonus, discount or frequent traveler program" -#~| msgid "Program" #~ msgctxt "name of a frequent flyer program" #~ msgid "Program" #~ msgstr "Программа" @@ -3653,19 +3491,16 @@ #~ msgstr "%1 %2" #, fuzzy -#~| msgid "Days" #~ msgctxt "kirigami-addons" #~ msgid "Days" #~ msgstr "Дни" #, fuzzy -#~| msgid "Months" #~ msgctxt "kirigami-addons" #~ msgid "Months" #~ msgstr "Месяцы" #, fuzzy -#~| msgid "Years" #~ msgctxt "kirigami-addons" #~ msgid "Years" #~ msgstr "Годы" @@ -3686,7 +3521,6 @@ #~ msgstr "Номер:" #, fuzzy -#~| msgid "Boarding time:" #~ msgid "Bording time" #~ msgstr "Время посадки:" @@ -3727,3 +3561,6 @@ #~ msgid "Check Calendar" #~ msgstr "Проверить календарь" + +#~ msgid "Pick coordinate" +#~ msgstr "Выбрать координату" diff -Nru itinerary-23.08.2/po/uk/kde-itinerary.po itinerary-23.08.3/po/uk/kde-itinerary.po --- itinerary-23.08.2/po/uk/kde-itinerary.po 2023-10-09 15:33:21.000000000 +0000 +++ itinerary-23.08.3/po/uk/kde-itinerary.po 2023-11-06 16:17:36.000000000 +0000 @@ -9,7 +9,7 @@ "Project-Id-Version: kde-itinerary\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2023-10-05 02:26+0000\n" -"PO-Revision-Date: 2023-08-17 09:04+0300\n" +"PO-Revision-Date: 2023-11-02 17:04+0200\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" "Language: uk\n" @@ -135,7 +135,7 @@ #, kde-format msgctxt "cancel as in revoking a booking" msgid "Cancel Reservation" -msgstr "Скасувати бронювання" +msgstr "Скасувати резервування" #: app/ActionsCard.qml:84 #, kde-format @@ -150,12 +150,12 @@ #: app/ActionsCard.qml:86 #, kde-format msgid "Change Reservation" -msgstr "Змінити бронювання" +msgstr "Змінити резервування" #: app/ActionsCard.qml:87 #, kde-format msgid "View Reservation" -msgstr "Переглянути бронювання" +msgstr "Переглянути резервування" #: app/ActionsCard.qml:133 #, kde-format @@ -229,7 +229,7 @@ msgid "" "Do you really want to replace your existing reservation with the newly " "selected journey?" -msgstr "Ви справді хочете замінити ваше наявне бронювання на нове?" +msgstr "Ви справді хочете замінити ваше наявне резервування на нове?" #: app/AlternativeJourneyPage.qml:136 #, kde-format @@ -252,10 +252,10 @@ #, kde-format msgid "One reservation imported." msgid_plural "%1 reservations imported." -msgstr[0] "Імпортовано %1 бронювання" -msgstr[1] "Імпортовано %1 бронювання" -msgstr[2] "Імпортовано %1 бронювань" -msgstr[3] "Імпортовано одне бронювання" +msgstr[0] "Імпортовано %1 резервування" +msgstr[1] "Імпортовано %1 резервування" +msgstr[2] "Імпортовано %1 резервувань" +msgstr[3] "Імпортовано одне резервування" #: app/applicationcontroller.cpp:435 #, kde-format @@ -428,7 +428,7 @@ #: app/BusEditor.qml:18 #, kde-format msgid "Edit Bus Reservation" -msgstr "Редагування бронювання місця в автобусі" +msgstr "Редагування резервування місця в автобусі" #: app/BusEditor.qml:47 app/TrainEditor.qml:50 #, kde-format @@ -719,7 +719,7 @@ #: app/DocumentsCard.qml:111 #, kde-format msgid "No documents attached to this reservation." -msgstr "До цього бронювання не долучено жодних документів." +msgstr "До цього резервування не долучено жодних документів." #: app/DocumentsCard.qml:119 #, kde-format @@ -1451,7 +1451,7 @@ #: app/HotelEditor.qml:18 #, kde-format msgid "Edit Hotel Reservation" -msgstr "Редагування бронювання готелю" +msgstr "Редагування резервування готелю" #: app/HotelEditor.qml:49 #, kde-format @@ -1479,7 +1479,7 @@ #: app/HotelPage.qml:16 #, kde-format msgid "Hotel Reservation" -msgstr "Бронювання готелю" +msgstr "Резервування готелю" #: app/HotelPage.qml:69 #, kde-format @@ -2054,7 +2054,7 @@ #: app/main.qml:122 #, kde-format msgid "Import Reservation" -msgstr "Імпортувати бронювання" +msgstr "Імпортувати резервування" #: app/main.qml:124 #, kde-format @@ -2365,7 +2365,7 @@ #: app/ProgramMembershipPage.qml:17 #, kde-format msgid "Program Membership" -msgstr "Учасник програми" +msgstr "Участь у програмі" #: app/ProgramMembershipPage.qml:91 #, kde-format @@ -2466,7 +2466,7 @@ #: app/RestaurantPage.qml:16 #, kde-format msgid "Restaurant Reservation" -msgstr "Бронювання ресторану" +msgstr "Резервування ресторану" #: app/RestaurantPage.qml:63 #, kde-format @@ -2977,7 +2977,7 @@ #: app/TrainEditor.qml:19 #, kde-format msgid "Edit Train Reservation" -msgstr "Змінити бронювання квитків на потяг" +msgstr "Змінити резервування квитків на потяг" #: app/TrainEditor.qml:53 #, kde-format diff -Nru itinerary-23.08.2/po/zh_CN/kde-itinerary.po itinerary-23.08.3/po/zh_CN/kde-itinerary.po --- itinerary-23.08.2/po/zh_CN/kde-itinerary.po 2023-10-09 15:33:21.000000000 +0000 +++ itinerary-23.08.3/po/zh_CN/kde-itinerary.po 2023-11-06 16:17:36.000000000 +0000 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2023-10-05 02:26+0000\n" -"PO-Revision-Date: 2023-09-16 10:12\n" +"PO-Revision-Date: 2023-10-21 13:58\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -Nru itinerary-23.08.2/.reuse/dep5 itinerary-23.08.3/.reuse/dep5 --- itinerary-23.08.2/.reuse/dep5 2023-10-09 15:33:21.000000000 +0000 +++ itinerary-23.08.3/.reuse/dep5 2023-11-06 16:17:36.000000000 +0000 @@ -26,3 +26,7 @@ Files: src/app/android/res/values-*/strings.xml Copyright: KDE Translation Teams License: LGPL-2.0-or-later + +Files: snapcraft.yaml +Copyright: Scarlett Moore +License: LGPL-2.0-or-later diff -Nru itinerary-23.08.2/snapcraft.yaml itinerary-23.08.3/snapcraft.yaml --- itinerary-23.08.2/snapcraft.yaml 1970-01-01 00:00:00.000000000 +0000 +++ itinerary-23.08.3/snapcraft.yaml 2023-11-06 16:17:36.000000000 +0000 @@ -0,0 +1,170 @@ +# trigger rebuild +--- +name: itinerary +confinement: strict +grade: stable +base: core22 +adopt-info: itinerary +apps: + itinerary: + # extensions: + # - kde-neon + common-id: org.kde.itinerary + desktop: usr/share/applications/org.kde.itinerary.desktop + command: usr/bin/itinerary + plugs: + - home + - desktop + - desktop-legacy + - opengl + - wayland + - x11 + - audio-playback + - unity7 + - network + - network-bind + - cups + - network-manager-observe + command-chain: + - snap/command-chain/desktop-launch +assumes: +- snapd2.55.3 +compression: lzo +plugs: + desktop: + mount-host-font-cache: false + icon-themes: + interface: content + target: $SNAP/data-dir/icons + default-provider: gtk-common-themes + sound-themes: + interface: content + target: $SNAP/data-dir/sounds + default-provider: gtk-common-themes + kf5-5-110-qt-5-15-11-core22: + content: kf5-5-110-qt-5-15-11-core22-all + interface: content + default-provider: kf5-5-110-qt-5-15-11-core22 + target: $SNAP/kf5 + foo-install-cups: + interface: content + content: foo + default-provider: cups + target: $SNAP_DATA/foo +environment: + SNAP_DESKTOP_RUNTIME: $SNAP/kf5 + QT_QUICK_CONTROLS_STYLE: org.kde.desktop + QML2_IMPORT_PATH: "$QML2_IMPORT_PATH:$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET/qml:$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/qml:$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/qml/org/kde/kirigami.2:$SNAP/kf5/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/qml" +hooks: + configure: + plugs: + - desktop + command-chain: + - snap/command-chain/hooks-configure-desktop +layout: + /usr/share/X11: + symlink: $SNAP/kf5/usr/share/X11 +slots: + session-dbus-interface: + interface: dbus + name: org.kde.itinerary + bus: session +package-repositories: +- type: apt + components: + - main + suites: + - jammy + key-id: 444DABCF3667D0283F894EDDE6D4736255751E5D + url: http://origin.archive.neon.kde.org/user + key-server: keyserver.ubuntu.com +parts: + kde-neon: + source: /snap/snapcraft/current/share/snapcraft/extensions/desktop/kde-neon + source-type: local + plugin: make + make-parameters: + - PLATFORM_PLUG=kf5-5-110-qt-5-15-11-core22 + build-snaps: + - kf5-5-110-qt-5-15-11-core22-sdk + build-environment: + - &id001 + PATH: /snap/kf5-5-110-qt-5-15-11-core22-sdk/current/usr/bin${PATH:+:$PATH} + - &id002 + XDG_DATA_DIRS: $CRAFT_STAGE/usr/share:/snap/kf5-5-110-qt-5-15-11-core22-sdk/current/usr/share:/usr/share${XDG_DATA_DIRS:+:$XDG_DATA_DIRS} + - &id003 + XDG_CONFIG_HOME: $CRAFT_STAGE/etc/xdg:/snap/kf5-5-110-qt-5-15-11-core22-sdk/current/etc/xdg:/etc/xdg${XDG_CONFIG_HOME:+:$XDG_CONFIG_HOME} + - &id004 + CRAFT_CMAKE_ARGS: -DCMAKE_FIND_ROOT_PATH=/snap/kf5-5-110-qt-5-15-11-core22-sdk/current${CRAFT_CMAKE_ARGS:+:$CRAFT_CMAKE_ARGS} + itinerary: + after: + - kde-neon + parse-info: + - usr/share/metainfo/org.kde.itinerary.appdata.xml + plugin: cmake + build-packages: + - libkf5doctools-dev + - kirigami-addons-dev + - kosmindoormap-dev + - libkf5calendarcore-dev + - libkf5contacts-dev + - libkf5holidays-dev + - libkf5networkmanagerqt-dev + - libkf5qqc2desktopstyle-dev + - libkhealthcertificate-dev + - libkpimitinerary-dev + - libkpimpkpass-dev + - libkpublictransport-dev + - libquotient-dev + - shared-mime-info + - zlib1g-dev + stage-packages: + - kirigami-addons-data + - qml-module-org-kde-kirigamiaddons + - libkosmindoormap1 + - qml-module-org-kde-kosmindoormap + - libkf5calendarcore5 + - libkf5contacts5 + - libkf5holidays5 + - libkf5networkmanagerqt6 + - qml-module-org-kde-qqc2desktopstyle + - libkhealthcertificate1 + - qml-module-org-kde-khealthcertificate + - libkpimitinerary5 + - libkpimpkpass5 + - libkpublictransport1 + - qml-module-org-kde-kpublictransport + - libquotient0.6 + - shared-mime-info + - zlib1g + - qml-module-org-kde-solid + - qml-module-org-kde-kirigami-addons-labs-mobileform + - qml-module-org-kde-prison + - qml-module-org-kde-kopeninghours + source: . + source-type: local + cmake-parameters: + - -DKDE_INSTALL_USE_QT_SYS_PATHS=FALSE + - "-DCMAKE_INSTALL_PREFIX=/usr" + - "-DCMAKE_BUILD_TYPE=Release" + - "-DENABLE_TESTING=OFF" + - "-DBUILD_TESTING=OFF" + - "-DKDE_SKIP_TEST_SETTINGS=ON" + - "-DCMAKE_FIND_ROOT_PATH=$CRAFT_STAGE\\;/snap/kf5-5-110-qt-5-15-11-core22-sdk/current" + - "-DKDE_INSTALL_PLUGINDIR=/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/plugins/" + build-environment: &id005 + - *id001 + - *id002 + - *id003 + - *id004 + prime: + - "-usr/lib/*/cmake/*" + - "-usr/include/*" + - "-usr/share/ECM/*" + - "-usr/share/doc/*" + - "-usr/share/man/*" + - "-usr/share/icons/breeze-dark*" + - "-usr/bin/X11" + - "-usr/lib/gcc/$CRAFT_ARCH_TRIPLET/6.0.0" + - "-usr/lib/aspell/*" + - "-etc/alsa/conf.d/99-pulse.conf" diff -Nru itinerary-23.08.2/src/app/android/build.gradle itinerary-23.08.3/src/app/android/build.gradle --- itinerary-23.08.2/src/app/android/build.gradle 2023-10-09 15:33:21.000000000 +0000 +++ itinerary-23.08.3/src/app/android/build.gradle 2023-11-06 16:17:36.000000000 +0000 @@ -103,6 +103,6 @@ aaptOptions { // different syntax than above // see https://android.googlesource.com/platform/frameworks/base/+/refs/heads/pie-release/tools/aapt2/util/Files.h#90 - ignoreAssetsPattern '!ECM:!aclocal:!doc:!gtk-doc:!man:!mime:!pkgconfig:!qlogging-categories5:!iso_15924.mo:!iso_3166.mo:!iso_3166_2.mo:iso_3166-3.mo:!iso_4217.mo:!iso_639.mo:!iso_639-2.mo:!iso_639-3.mo:!iso_639_3.mo:!iso_639-5.mo:!iso_639_5.mo:!kcodecs5_qt.qm:!kde5_xml_mimetypes.qm:!knotifications5_qt.qm:!libkholidays5_qt.qm:!libkmime5.mo:!iso_15924.json:!iso_3166-3.json:!iso_4217.json:!iso_639-2.json:!iso_639-3.json:!iso_639-5.json:!schema-15924.json:!schema-3166-1.json:!schema-3166-2.json:!schema-3166-3.json:!schema-4217.json:!schema-639-2.json:!schema-639-3.json:!schema-639-5.json' + ignoreAssetsPattern '!ECM:!aclocal:!doc:!fonts:!gtk-doc:!man:!mime:!ndk-modules:!pkgconfig:!qlogging-categories5:!qt5keychain:!sr@ijekavian:!sr@ijekavianlatin:!plugins:!iso_15924.mo:!iso_3166.mo:!iso_3166_2.mo:iso_3166-3.mo:!iso_4217.mo:!iso_639.mo:!iso_639-2.mo:!iso_639-3.mo:!iso_639_3.mo:!iso_639-5.mo:!iso_639_5.mo:!kcodecs5_qt.qm:!kde5_xml_mimetypes.qm:!karchive5_qt.qm:!kcontacts5.mo:!knotifications5_qt.qm:!libkholidays5_qt.qm:!libkmime5.mo:!iso_15924.json:!iso_3166-3.json:!iso_4217.json:!iso_639-2.json:!iso_639-3.json:!iso_639-5.json:!schema-15924.json:!schema-3166-1.json:!schema-3166-2.json:!schema-3166-3.json:!schema-4217.json:!schema-639-2.json:!schema-639-3.json:!schema-639-5.json' } } diff -Nru itinerary-23.08.2/src/app/android/res/values-ru/strings.xml itinerary-23.08.3/src/app/android/res/values-ru/strings.xml --- itinerary-23.08.2/src/app/android/res/values-ru/strings.xml 2023-10-09 15:33:21.000000000 +0000 +++ itinerary-23.08.3/src/app/android/res/values-ru/strings.xml 2023-11-06 16:17:36.000000000 +0000 @@ -3,4 +3,6 @@ Маршруты KDE Маршрут Текущий билет + Статистика + Текущий статус diff -Nru itinerary-23.08.2/src/app/org.kde.itinerary.appdata.xml itinerary-23.08.3/src/app/org.kde.itinerary.appdata.xml --- itinerary-23.08.2/src/app/org.kde.itinerary.appdata.xml 2023-10-09 15:33:21.000000000 +0000 +++ itinerary-23.08.3/src/app/org.kde.itinerary.appdata.xml 2023-11-06 16:17:36.000000000 +0000 @@ -727,6 +727,16 @@ org.kde.itinerary.desktop + + +
    +
  • Fix handling of canceled intermediate stops on board of DB ICEs.
    • +
  • New or improved travel document extractors for booking.com, DB, European Sleeper, Iberia, PKP, Pretix, Qatar Airways.
    • +
  • Fix parsing certain invalid Apple Wallet message catalogs.
    • +
  • Remove unnecessary PDF fonts to reduce the APK size.
    • +
+ +
    diff -Nru itinerary-23.08.2/src/app/org.kde.itinerary.desktop itinerary-23.08.3/src/app/org.kde.itinerary.desktop --- itinerary-23.08.2/src/app/org.kde.itinerary.desktop 2023-10-09 15:33:21.000000000 +0000 +++ itinerary-23.08.3/src/app/org.kde.itinerary.desktop 2023-11-06 16:17:36.000000000 +0000 @@ -208,6 +208,7 @@ Name[pl]=Stan na żywo Name[pt]=Estado em Directo Name[pt_BR]=Status ao vivo +Name[ru]=Текущий статус Name[sl]=Stanje v živo Name[sv]=Realtidsstatus Name[tr]=Canlı Durum diff -Nru itinerary-23.08.2/src/thumbnailer/itinerarythumbnail.json itinerary-23.08.3/src/thumbnailer/itinerarythumbnail.json --- itinerary-23.08.2/src/thumbnailer/itinerarythumbnail.json 2023-10-09 15:33:21.000000000 +0000 +++ itinerary-23.08.3/src/thumbnailer/itinerarythumbnail.json 2023-11-06 16:17:36.000000000 +0000 @@ -7,7 +7,7 @@ "Name": "Tickets and boarding passes", "Name[ca@valencia]": "Entrades i targetes d'embarcament", "Name[ca]": "Entrades i passis d'embarcament", - "Name[cs]": "Lístky a palubní letenky", + "Name[cs]": "Lístky a letenky", "Name[de]": "Fahrkarten und Bordkarten", "Name[en_GB]": "Tickets and boarding passes", "Name[eo]": "Biletoj kaj enirpermesiloj",