diff -Nru kgeography-21.12.2/CMakeLists.txt kgeography-21.12.3/CMakeLists.txt --- kgeography-21.12.2/CMakeLists.txt 2022-02-01 00:02:58.000000000 +0000 +++ kgeography-21.12.3/CMakeLists.txt 2022-03-01 00:03:49.000000000 +0000 @@ -3,7 +3,7 @@ # KDE Application Version, managed by release script set(RELEASE_SERVICE_VERSION_MAJOR "21") set(RELEASE_SERVICE_VERSION_MINOR "12") -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(kgeography VERSION ${RELEASE_SERVICE_VERSION}) diff -Nru kgeography-21.12.2/debian/changelog kgeography-21.12.3/debian/changelog --- kgeography-21.12.2/debian/changelog 2022-02-03 07:17:03.000000000 +0000 +++ kgeography-21.12.3/debian/changelog 2022-03-03 10:10:29.000000000 +0000 @@ -1,3 +1,9 @@ +kgeography (4:21.12.3-0ubuntu1) jammy; urgency=medium + + * New upstream release (21.12.3) + + -- Rik Mills Thu, 03 Mar 2022 10:10:29 +0000 + kgeography (4:21.12.2-0ubuntu1) jammy; urgency=medium [ José Manuel Santamaría Lema ] diff -Nru kgeography-21.12.2/po/nn/kgeography.po kgeography-21.12.3/po/nn/kgeography.po --- kgeography-21.12.2/po/nn/kgeography.po 2022-02-01 00:02:58.000000000 +0000 +++ kgeography-21.12.3/po/nn/kgeography.po 2022-03-01 00:03:48.000000000 +0000 @@ -1,21 +1,21 @@ # Translation of kgeography to Norwegian Nynorsk # # Knut Nordanger , 2005. -# Karl Ove Hufthammer , 2007, 2008, 2009, 2010, 2011, 2018, 2019, 2020, 2021. +# Karl Ove Hufthammer , 2007, 2008, 2009, 2010, 2011, 2018, 2019, 2020, 2021, 2022. # Eirik U. Birkeland , 2008, 2009, 2010, 2011. msgid "" msgstr "" "Project-Id-Version: kgeography\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2021-10-19 00:13+0000\n" -"PO-Revision-Date: 2021-07-07 13:30+0200\n" +"PO-Revision-Date: 2022-02-26 14:17+0100\n" "Last-Translator: Karl Ove Hufthammer \n" "Language-Team: Norwegian Nynorsk \n" "Language: nn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 21.04.2\n" +"X-Generator: Lokalize 21.12.2\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Environment: kde\n" "X-Accelerator-Marker: &\n" @@ -3274,11 +3274,13 @@ msgid "Ukraine" msgstr "Ukraina" +# Anbefalt skrivemåte på norsk er Kyiv, ikkje Kiev, jf. https://www.sprakradet.no/Vi-og-vart/hva-skjer/Aktuelt-ord/kyiv-og-andre-navn-i-ukraina/ +# Sjå òg https://www.sprakradet.no/sprakhjelp/Skriverad/navn-pa-steder-og-personer/Geografiske_namn/utanlandske-stadnamn-aa/#Kyiv #: asia.kgm:268 #, kde-format msgctxt "asia.kgm" msgid "Kyiv" -msgstr "" +msgstr "Kyiv" #: asia.kgm:276 #, kde-format @@ -13056,11 +13058,13 @@ msgid "Ukraine" msgstr "Ukraina" +# Anbefalt skrivemåte på norsk er Kyiv, ikkje Kiev, jf. https://www.sprakradet.no/Vi-og-vart/hva-skjer/Aktuelt-ord/kyiv-og-andre-navn-i-ukraina/ +# Sjå òg https://www.sprakradet.no/sprakhjelp/Skriverad/navn-pa-steder-og-personer/Geografiske_namn/utanlandske-stadnamn-aa/#Kyiv #: europe.kgm:484 #, kde-format msgctxt "europe.kgm" msgid "Kyiv" -msgstr "" +msgstr "Kyiv" #: europe.kgm:492 #, kde-format @@ -22481,7 +22485,7 @@ #, kde-format msgctxt "kazakhstan.kgm" msgid "Qostanay" -msgstr "Qostanay" +msgstr "Kostanaj" #: kazakhstan.kgm:85 #, kde-format @@ -35484,330 +35488,394 @@ msgid "Ukraine" msgstr "Ukraina" +# https://nn.wikipedia.org/wiki/Oblast_i_Ukraina #: ukraine.kgm:6 #, kde-format msgctxt "ukraine.kgm" msgid "Oblasts" msgstr "Oblast" +# https://nn.wikipedia.org/wiki/Volyn_oblast #: ukraine.kgm:10 #, kde-format msgctxt "ukraine.kgm" msgid "Volyns'ka oblast'" -msgstr "Volyns'ka oblast'" +msgstr "Volyn oblast" +# https://nn.wikipedia.org/wiki/Lutsk #: ukraine.kgm:11 #, kde-format msgctxt "ukraine.kgm" msgid "Luts'k" -msgstr "Luts'k" +msgstr "Lutsk" +# https://nn.wikipedia.org/wiki/Lviv_oblast #: ukraine.kgm:16 #, kde-format msgctxt "ukraine.kgm" msgid "L'vivs'ka oblast'" -msgstr "L'vivs'ka oblast'" +msgstr "Lviv oblast" +# https://nn.wikipedia.org/wiki/Lviv #: ukraine.kgm:17 #, kde-format msgctxt "ukraine.kgm" msgid "L'viv" -msgstr "L'viv" +msgstr "Lviv" +# https://nn.wikipedia.org/wiki/Zakarpattja_oblast +# (Men bokmålswikipedia brukar «Zakarpatska oblast», https://no.wikipedia.org/wiki/Zakarpatska_oblast.) #: ukraine.kgm:22 #, kde-format msgctxt "ukraine.kgm" msgid "Zakarpats'ka oblast'" -msgstr "Zakarpats'ka oblast'" +msgstr "Zakarpattja oblast" +# https://nn.wikipedia.org/wiki/Uzjhorod #: ukraine.kgm:23 #, kde-format msgctxt "ukraine.kgm" msgid "Uzhhorod" -msgstr "Uzhhorod" +msgstr "Uzjhorod" +# https://no.wikipedia.org/wiki/Rivne_oblast #: ukraine.kgm:28 #, kde-format msgctxt "ukraine.kgm" msgid "Rivnens'ka oblast'" -msgstr "Rivnens'ka oblast'" +msgstr "Rivne oblast" +# https://nn.wikipedia.org/wiki/Rivne #: ukraine.kgm:29 #, kde-format msgctxt "ukraine.kgm" msgid "Rivne" msgstr "Rivne" +# https://nn.wikipedia.org/wiki/Ternopil_oblast #: ukraine.kgm:34 #, kde-format msgctxt "ukraine.kgm" msgid "Ternopil's'ka oblast'" -msgstr "Ternopil's'ka oblast'" +msgstr "Ternopil oblast" +# https://nn.wikipedia.org/wiki/Ternopil #: ukraine.kgm:35 #, kde-format msgctxt "ukraine.kgm" msgid "Ternopil'" -msgstr "Ternopil'" +msgstr "Ternopil" +# https://nn.wikipedia.org/wiki/Khmelnytskyj_oblast #: ukraine.kgm:40 #, kde-format msgctxt "ukraine.kgm" msgid "Khmel'nyts'ka oblast'" -msgstr "Khmel'nyts'ka oblast'" +msgstr "Khmelnytskyj oblast" +# https://nn.wikipedia.org/wiki/Khmelnytskyj #: ukraine.kgm:41 #, kde-format msgctxt "ukraine.kgm" msgid "Khmel'nyts'ky" -msgstr "Khmel'nyts'ky" +msgstr "Khmelnytskyj" +# https://nn.wikipedia.org/wiki/Ivano-Frankivsk_oblast #: ukraine.kgm:46 #, kde-format msgctxt "ukraine.kgm" msgid "Ivano-Frankivs'ka oblast'" -msgstr "Ivano-Frankivs'ka oblast'" +msgstr "Ivano-Frankivsk oblast" +# https://nn.wikipedia.org/wiki/Ivano-Frankivsk #: ukraine.kgm:47 #, kde-format msgctxt "ukraine.kgm" msgid "Ivano-Frankivs'k" -msgstr "Ivano-Frankivs'k" +msgstr "Ivano-Frankivsk" +# https://nn.wikipedia.org/wiki/Tsjernivtsi_oblast #: ukraine.kgm:52 #, kde-format msgctxt "ukraine.kgm" msgid "Chernivets'ka oblast'" -msgstr "Chernivets'ka oblast'" +msgstr "Tsjernivtsi oblast" +# https://nn.wikipedia.org/wiki/Tsjernivtsi #: ukraine.kgm:53 #, kde-format msgctxt "ukraine.kgm" msgid "Chernivtsi" -msgstr "Chernivtsi" +msgstr "Tsjernivtsi" +# https://nn.wikipedia.org/wiki/Zjytomyr_oblast #: ukraine.kgm:58 #, kde-format msgctxt "ukraine.kgm" msgid "Zhytomyrs'ka oblast'" -msgstr "Zhytomyrs'ka oblast'" +msgstr "Zjytomyr oblast" #: ukraine.kgm:59 #, kde-format msgctxt "ukraine.kgm" msgid "Zhytomyr" -msgstr "Zhytomyr" +msgstr "Zjytomyr" +# https://nn.wikipedia.org/wiki/Vinnytsia_oblast #: ukraine.kgm:64 #, kde-format msgctxt "ukraine.kgm" msgid "Vinnyts'ka oblast'" -msgstr "Vinnyts'ka oblast'" +msgstr "Vinnytsia oblast" +# https://nn.wikipedia.org/wiki/Vinnytsia #: ukraine.kgm:65 #, kde-format msgctxt "ukraine.kgm" msgid "Vinnytsya" -msgstr "Vinnytsya" +msgstr "Vinnytsia" +# https://nn.wikipedia.org/wiki/Kyiv_oblast #: ukraine.kgm:70 #, kde-format msgctxt "ukraine.kgm" msgid "Kyivs'ka oblast'" -msgstr "Kyivs'ka oblast'" +msgstr "Kyiv oblast" +# Anbefalt skrivemåte på norsk er Kyiv, ikkje Kiev, jf. https://www.sprakradet.no/Vi-og-vart/hva-skjer/Aktuelt-ord/kyiv-og-andre-navn-i-ukraina/ +# Sjå òg https://www.sprakradet.no/sprakhjelp/Skriverad/navn-pa-steder-og-personer/Geografiske_namn/utanlandske-stadnamn-aa/#Kyiv #: ukraine.kgm:71 #, kde-format msgctxt "ukraine.kgm" msgid "Kyiv" -msgstr "Kiev" +msgstr "Kyiv" +# https://nn.wikipedia.org/wiki/Tsjerkasy_oblast #: ukraine.kgm:76 #, kde-format msgctxt "ukraine.kgm" msgid "Cherkas'ka oblast'" -msgstr "Cherkas'ka oblast'" +msgstr "Tsjerkasy oblast" +# https://nn.wikipedia.org/wiki/Tsjerkasy #: ukraine.kgm:77 #, kde-format msgctxt "ukraine.kgm" msgid "Cherkasy" -msgstr "Cherkasy" +msgstr "Tsjerkasy" +# https://nn.wikipedia.org/wiki/Kirovohrad_oblast #: ukraine.kgm:82 #, kde-format msgctxt "ukraine.kgm" msgid "Kirovohrads'ka oblast'" -msgstr "Kirovohrads'ka oblast'" +msgstr "Kirovohrad oblast" +# https://nn.wikipedia.org/wiki/Kropyvnytskyj #: ukraine.kgm:83 #, kde-format msgctxt "ukraine.kgm" msgid "Kropyvnytskiy" -msgstr "" +msgstr "Kropyvnytskyj" +# https://nn.wikipedia.org/wiki/Mykolajiv_oblast #: ukraine.kgm:88 #, kde-format msgctxt "ukraine.kgm" msgid "Mykolayivs'ka oblast'" -msgstr "Mykolayivs'ka oblast'" +msgstr "Mykolajiv oblast" +# https://nn.wikipedia.org/wiki/Mykolajiv #: ukraine.kgm:89 #, kde-format msgctxt "ukraine.kgm" msgid "Mykolayiv" -msgstr "Mykolayiv" +msgstr "Mykolajiv" +# (Tidlegare skrive med to s-ar) +# https://www.sprakradet.no/sprakhjelp/Skriverad/navn-pa-steder-og-personer/Geografiske_namn/utanlandske-stadnamn-aa/ +# https://www.sprakradet.no/Vi-og-vart/hva-skjer/Aktuelt-ord/kyiv-og-andre-navn-i-ukraina/ #: ukraine.kgm:94 #, kde-format msgctxt "ukraine.kgm" msgid "Odes'ka oblast'" -msgstr "Odes'ka oblast'" +msgstr "Odesa oblast" +# (Tidlegare skrive med to s-ar) +# https://www.sprakradet.no/sprakhjelp/Skriverad/navn-pa-steder-og-personer/Geografiske_namn/utanlandske-stadnamn-aa/ +# https://www.sprakradet.no/Vi-og-vart/hva-skjer/Aktuelt-ord/kyiv-og-andre-navn-i-ukraina/ #: ukraine.kgm:95 #, kde-format msgctxt "ukraine.kgm" msgid "Odesa" msgstr "Odesa" +# https://nn.wikipedia.org/wiki/Tsjernihiv_oblast +# https://www.sprakradet.no/sprakhjelp/Skriverad/navn-pa-steder-og-personer/Geografiske_namn/utanlandske-stadnamn-aa/#Tsjernihiv #: ukraine.kgm:100 #, kde-format msgctxt "ukraine.kgm" msgid "Chernihivs'ka oblast'" -msgstr "Chernihivs'ka oblast'" +msgstr "Tsjernihiv oblast" +# https://nn.wikipedia.org/wiki/Tsjernihiv #: ukraine.kgm:101 #, kde-format msgctxt "ukraine.kgm" msgid "Chernihiv" -msgstr "Chernihiv" +msgstr "Tsjernihiv" +# https://nn.wikipedia.org/wiki/Sumy_oblast #: ukraine.kgm:106 #, kde-format msgctxt "ukraine.kgm" msgid "Sums'ka oblast'" -msgstr "Sums'ka oblast'" +msgstr "Sumy oblast" +# https://nn.wikipedia.org/wiki/Sumy #: ukraine.kgm:107 #, kde-format msgctxt "ukraine.kgm" msgid "Sumy" msgstr "Sumy" +# https://nn.wikipedia.org/wiki/Poltava_oblast #: ukraine.kgm:112 #, kde-format msgctxt "ukraine.kgm" msgid "Poltavs'ka oblast'" -msgstr "Poltavs'ka oblast'" +msgstr "Poltava oblast" +# https://nn.wikipedia.org/wiki/Poltava #: ukraine.kgm:113 #, kde-format msgctxt "ukraine.kgm" msgid "Poltava" msgstr "Poltava" +# https://nn.wikipedia.org/wiki/Kharkiv_oblast #: ukraine.kgm:118 #, kde-format msgctxt "ukraine.kgm" msgid "Kharkivs'ka oblast'" -msgstr "Kharkivs'ka oblast'" +msgstr "Kharkiv oblast" +# https://nn.wikipedia.org/wiki/Kharkiv #: ukraine.kgm:119 #, kde-format msgctxt "ukraine.kgm" msgid "Kharkiv" msgstr "Kharkiv" +# https://nn.wikipedia.org/wiki/Dnipropetrovsk_oblast #: ukraine.kgm:124 #, kde-format msgctxt "ukraine.kgm" msgid "Dnipropetrovs'ka oblast'" -msgstr "Dnipropetrovs'ka oblast'" +msgstr "Dnipropetrovsk oblast" +# https://no.wikipedia.org/wiki/Dnipro_(by) +# https://www.sprakradet.no/sprakhjelp/Skriverad/navn-pa-steder-og-personer/Geografiske_namn/utanlandske-stadnamn-aa/ +# (før Dnipropetrovsk) #: ukraine.kgm:125 ukraine.kgm:170 #, kde-format msgctxt "ukraine.kgm" msgid "Dnipro" msgstr "Dnipro" +# https://nn.wikipedia.org/wiki/Donetsk_oblast #: ukraine.kgm:130 #, kde-format msgctxt "ukraine.kgm" msgid "Donets'ka oblast'" -msgstr "Donets'ka oblast'" +msgstr "Donetsk oblast" +# https://nn.wikipedia.org/wiki/Donetsk #: ukraine.kgm:131 #, kde-format msgctxt "ukraine.kgm" msgid "Donets'k" -msgstr "Donets'k" +msgstr "Donetsk" +# https://nn.wikipedia.org/wiki/Zaporizjzjia_oblast #: ukraine.kgm:136 #, kde-format msgctxt "ukraine.kgm" msgid "Zaporiz'ka oblast'" -msgstr "Zaporiz'ka oblast'" +msgstr "Zaporizjzjia oblast" +# https://nn.wikipedia.org/wiki/Zaporizjzjia #: ukraine.kgm:137 #, kde-format msgctxt "ukraine.kgm" msgid "Zaporizhzhia" -msgstr "Zaporizhzhia" +msgstr "Zaporizjzjia" +# https://nn.wikipedia.org/wiki/Kherson_oblast #: ukraine.kgm:142 #, kde-format msgctxt "ukraine.kgm" msgid "Khersons'ka oblast'" -msgstr "Khersons'ka oblast'" +msgstr "Kherson oblast" +# https://nn.wikipedia.org/wiki/Kherson #: ukraine.kgm:143 #, kde-format msgctxt "ukraine.kgm" msgid "Kherson" msgstr "Kherson" +# https://nn.wikipedia.org/wiki/Luhansk_oblast #: ukraine.kgm:148 #, kde-format msgctxt "ukraine.kgm" msgid "Luhans'ka oblast'" -msgstr "Luhans'ka oblast'" +msgstr "Luhansk oblast" +# https://nn.wikipedia.org/wiki/Luhansk #: ukraine.kgm:149 #, kde-format msgctxt "ukraine.kgm" msgid "Luhans'k" -msgstr "Luhans'k" +msgstr "Luhansk" +# https://nn.wikipedia.org/wiki/Krimhalv%C3%B8ya #: ukraine.kgm:154 #, kde-format msgctxt "ukraine.kgm" msgid "Autonomous Republic of Crimea" msgstr "Den autonome republikken Krim" +# https://nn.wikipedia.org/wiki/Simferopol #: ukraine.kgm:155 #, kde-format msgctxt "ukraine.kgm" msgid "Simferopol'" -msgstr "Simferopol'" +msgstr "Simferopol" +# Anbefalt skrivemåte på norsk er Kyiv, ikkje Kiev, jf. https://www.sprakradet.no/Vi-og-vart/hva-skjer/Aktuelt-ord/kyiv-og-andre-navn-i-ukraina/ +# Sjå òg https://www.sprakradet.no/sprakhjelp/Skriverad/navn-pa-steder-og-personer/Geografiske_namn/utanlandske-stadnamn-aa/#Kyiv #: ukraine.kgm:160 #, kde-format msgctxt "ukraine.kgm" msgid "City of Kyiv" -msgstr "Byen Kiev" +msgstr "Byen Kyiv" +# https://nn.wikipedia.org/wiki/Sevastopol #: ukraine.kgm:165 #, kde-format msgctxt "ukraine.kgm" msgid "City of Sevastopol'" -msgstr "Byen Sevastopol'" +msgstr "Byen Sevastopol" +# https://nn.wikipedia.org/wiki/Azovhavet #: ukraine.kgm:176 #, kde-format msgctxt "ukraine.kgm" msgid "Azov Sea" msgstr "Azovhavet" +# https://nn.wikipedia.org/wiki/Svartehavet #: ukraine.kgm:182 #, kde-format msgctxt "ukraine.kgm" @@ -40771,11 +40839,13 @@ msgid "Ukraine" msgstr "Ukraina" +# Anbefalt skrivemåte på norsk er Kyiv, ikkje Kiev, jf. https://www.sprakradet.no/Vi-og-vart/hva-skjer/Aktuelt-ord/kyiv-og-andre-navn-i-ukraina/ +# Sjå òg https://www.sprakradet.no/sprakhjelp/Skriverad/navn-pa-steder-og-personer/Geografiske_namn/utanlandske-stadnamn-aa/#Kyiv #: world.kgm:1048 #, kde-format msgctxt "world.kgm" msgid "Kyiv" -msgstr "" +msgstr "Kyiv" #: world.kgm:1056 #, kde-format diff -Nru kgeography-21.12.2/po/ro/kgeography.po kgeography-21.12.3/po/ro/kgeography.po --- kgeography-21.12.2/po/ro/kgeography.po 2022-02-01 00:02:58.000000000 +0000 +++ kgeography-21.12.3/po/ro/kgeography.po 2022-03-01 00:03:48.000000000 +0000 @@ -1,8 +1,6 @@ # Traducerea kgeography.po în Română -# Copyright (C) YEAR This_file_is_part_of_KDE -# This file is distributed under the same license as the PACKAGE package. -# Sergiu Bivol , 2008. -# Sergiu Bivol , 2008, 2009, 2010. +# This file is distributed under the same license as the kgeography package. +# Sergiu Bivol , 2008, 2009, 2010, 2022. # Florentina Mușat , 2010. # Victor Cărbune , 2010. # @@ -11,15 +9,16 @@ "Project-Id-Version: kgeography\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2021-10-19 00:13+0000\n" -"PO-Revision-Date: 2010-12-23 22:33+0200\n" -"Last-Translator: Victor Cărbune \n" -"Language-Team: Română \n" +"PO-Revision-Date: 2022-02-16 11:27+0000\n" +"Last-Translator: Sergiu Bivol \n" +"Language-Team: Romanian\n" "Language: ro\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " "20)) ? 1 : 2;\n" +"X-Generator: Lokalize 21.12.2\n" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -3438,7 +3437,7 @@ #, kde-format msgctxt "asia.kgm" msgid "Malaysia" -msgstr "Malaysia" +msgstr "Malaezia" #: asia.kgm:378 #, kde-format diff -Nru kgeography-21.12.2/po/zh_CN/kgeography.po kgeography-21.12.3/po/zh_CN/kgeography.po --- kgeography-21.12.2/po/zh_CN/kgeography.po 2022-02-01 00:02:58.000000000 +0000 +++ kgeography-21.12.3/po/zh_CN/kgeography.po 2022-03-01 00:03:48.000000000 +0000 @@ -9,7 +9,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2021-10-19 00:13+0000\n" -"PO-Revision-Date: 2022-01-08 15:25\n" +"PO-Revision-Date: 2022-02-26 05:19\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -Nru kgeography-21.12.2/src/org.kde.kgeography.appdata.xml kgeography-21.12.3/src/org.kde.kgeography.appdata.xml --- kgeography-21.12.2/src/org.kde.kgeography.appdata.xml 2022-01-28 22:34:04.000000000 +0000 +++ kgeography-21.12.3/src/org.kde.kgeography.appdata.xml 2022-02-27 18:03:48.000000000 +0000 @@ -323,9 +323,9 @@ + -