From 5ba38f7ca738ac099892780f6d44025925e3563d114a68967902516ebbe92d16 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 27 Dec 2017 08:35:56 +0000 Subject: [PATCH] Accepting request 559517 from home:Zaitor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Add gnome-maps-is-translations.patch: Update Icelandic translations. - Add gnome-maps-nb-translations.patch: Update Norwegian Bokmål translations. - Clean up spec, use modern macros. - Add lang package Recommends. OBS-URL: https://build.opensuse.org/request/show/559517 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-maps?expand=0&rev=92 --- gnome-maps-is-translations.patch | 306 +++++++++++++ gnome-maps-nb-translations.patch | 719 +++++++++++++++++++++++++++++++ gnome-maps.changes | 10 + gnome-maps.spec | 14 +- 4 files changed, 1044 insertions(+), 5 deletions(-) create mode 100644 gnome-maps-is-translations.patch create mode 100644 gnome-maps-nb-translations.patch diff --git a/gnome-maps-is-translations.patch b/gnome-maps-is-translations.patch new file mode 100644 index 0000000..2e201c4 --- /dev/null +++ b/gnome-maps-is-translations.patch @@ -0,0 +1,306 @@ +From d367381fe01a19156cb5d785a9c6257a9c414567 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Sveinn=20=C3=AD=20Felli?= +Date: Fri, 8 Dec 2017 08:58:42 +0000 +Subject: Update Icelandic translation + +--- + po/is.po | 66 +++++++++++++++++++++++++++++----------------------------------- + 1 file changed, 30 insertions(+), 36 deletions(-) + +diff --git a/po/is.po b/po/is.po +index 83522ee..3fc3a0d 100644 +--- a/po/is.po ++++ b/po/is.po +@@ -7,8 +7,8 @@ msgstr "" + "Project-Id-Version: \n" + "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" + "maps&keywords=I18N+L10N&component=general\n" +-"POT-Creation-Date: 2017-09-11 20:24+0000\n" +-"PO-Revision-Date: 2017-10-03 16:31+0000\n" ++"POT-Creation-Date: 2017-10-03 16:33+0000\n" ++"PO-Revision-Date: 2017-12-08 08:17+0000\n" + "Last-Translator: Sveinn í Felli \n" + "Language-Team: Icelandic \n" + "Language: is\n" +@@ -139,6 +139,8 @@ msgid "" + "Latest used Facebook check-in privacy setting. Possible values are: " + "EVERYONE, FRIENDS_OF_FRIENDS, ALL_FRIENDS or SELF." + msgstr "" ++"Síðast notuðu persónuleyndarstillingar við innskráningu á Facebook. Möguleg " ++"gildi eru: ALLIR, VINIR_VINA, ALLIR_VINIR eða SJÁLF(UR)." + + #: ../data/org.gnome.Maps.gschema.xml.h:17 + msgid "Foursquare check-in privacy setting" +@@ -149,26 +151,32 @@ msgid "" + "Latest used Foursquare check-in privacy setting. Possible values are: " + "public, followers or private." + msgstr "" ++"Síðast notuðu persónuleyndarstillingar við innskráningu á Foursquare. Möguleg " ++"gildi eru: opinbert, fylgjendur eða einka." + + #: ../data/org.gnome.Maps.gschema.xml.h:19 + msgid "Foursquare check-in Facebook broadcasting" +-msgstr "" ++msgstr "Tilkynning á Facebook við innskráningu á Foursquare" + + #: ../data/org.gnome.Maps.gschema.xml.h:20 + msgid "" + "Indicates if Foursquare should broadcast the check-in as a post in the " + "Facebook account associated with the Foursquare account." + msgstr "" ++"Gefur til kynna hvort Foursquare eigi að senda tilkynningu um innskráningu " ++"inn á Facebook-aðganginn sem tengist viðkomandi Foursquare-reikningi." + + #: ../data/org.gnome.Maps.gschema.xml.h:21 + msgid "Foursquare check-in Twitter broadcasting" +-msgstr "" ++msgstr "Tilkynning á Twitter við innskráningu á Foursquare" + + #: ../data/org.gnome.Maps.gschema.xml.h:22 + msgid "" + "Indicates if Foursquare should broadcast the check-in as a tweet in the " + "Twitter account associated with the Foursquare account." + msgstr "" ++"Gefur til kynna hvort Foursquare eigi að senda tíst um innskráningu inn á " ++"Twitter-aðganginn sem tengist viðkomandi Foursquare-reikningi." + + #: ../data/org.gnome.Maps.gschema.xml.h:23 + msgid "OpenStreetMap username or e-mail address" +@@ -182,7 +190,7 @@ msgstr "" + + #: ../data/org.gnome.Maps.gschema.xml.h:25 + msgid "Last used transportation type for routing" +-msgstr "" ++msgstr "Síðast notaða gerð samgangna fyrir leiðaval" + + #: ../data/ui/app-menu.ui.h:1 + msgid "Set up OpenStreetMap Account" +@@ -344,7 +352,6 @@ msgid "Switch to aerial view" + msgstr "Skipta yfir í loftmyndasýn" + + #: ../data/ui/help-overlay.ui.h:14 +-#| msgid "Open Layer" + msgctxt "shortcut window" + msgid "Open shape layer" + msgstr "Opna lag með lögunum" +@@ -391,9 +398,6 @@ msgid "Maps is offline!" + msgstr "Kortin eru án nettengingar!" + + #: ../data/ui/main-window.ui.h:13 +-#| msgid "" +-#| "Maps need an active internet connection to function properly, but one " +-#| "can't be found." + msgid "" + "Maps need an active internet connection to function properly, but one can’t " + "be found." +@@ -455,7 +459,6 @@ msgid "Sign In" + msgstr "Skrá inn" + + #: ../data/ui/osm-account-dialog.ui.h:8 +-#| msgid "Don't have an account?" + msgid "Don’t have an account?" + msgstr "Ertu ekki með aðgang?" + +@@ -528,9 +531,6 @@ msgid "Comment" + msgstr "Athugasemd" + + #: ../data/ui/osm-edit-dialog.ui.h:5 +-#| msgid "" +-#| "Map changes will be visible on all maps that use\n" +-#| " OpenStreetMap data." + msgid "" + "Map changes will be visible on all maps that use\n" + "OpenStreetMap data." +@@ -543,7 +543,6 @@ msgid "Recently Used" + msgstr "Nýlega notað" + + #: ../data/ui/osm-edit-dialog.ui.h:8 +-#| msgid "Edit on OpenStreetMap" + msgctxt "dialog title" + msgid "Edit on OpenStreetMap" + msgstr "Breyta í OpenStreetMap" +@@ -571,7 +570,6 @@ msgid "Press enter to search" + msgstr "Ýttu á Enter til að leita" + + #: ../data/ui/place-popover.ui.h:2 +-#| msgid "No route found." + msgid "No results found" + msgstr "Engar niðurstöður fundust" + +@@ -602,7 +600,6 @@ msgid "Route search by GraphHopper" + msgstr "Leita að leiðum með GraphHopper" + + #: ../data/ui/sidebar.ui.h:2 +-#| msgid "Route search by GraphHopper" + msgid "Route search by OpenTripPlanner" + msgstr "Leita að leiðum með OpenTripPlanner" + +@@ -634,7 +631,6 @@ msgstr "Fela biðstöðvar á leiðinni og upplýsingar" + + #. Translators: This is a tooltip + #: ../data/ui/transit-leg-row.ui.h:4 +-#| msgid "Show more information" + msgid "Show intermediate stops and information" + msgstr "Sýna biðstöðvar á leiðinni og upplýsingar" + +@@ -767,7 +763,6 @@ msgstr "Villa hefur átt sér stað" + #. Translators: %s is the place name that user wanted to check-in + #: ../src/checkIn.js:147 + #, javascript-format +-#| msgid "Cannot find \"%s\" in the social service" + msgid "Cannot find “%s” in the social service" + msgstr "Finn ekki \"%s\" á samfélagsmiðilsþjónustunni" + +@@ -804,8 +799,8 @@ msgid "" + "Location was added to the map, note that it may take a while before it shows " + "on the map and in search results." + msgstr "" +-"Staðsetningunni var bætt á kortið, athugaðu að nokkur tími getur liðið þangað " +-"til hún fer að sjást á kortinu eða koma upp í leitarniðurstöðum." ++"Staðsetningunni var bætt á kortið, athugaðu að nokkur tími getur liðið " ++"þangað til hún fer að sjást á kortinu eða koma upp í leitarniðurstöðum." + + #: ../src/exportViewDialog.js:156 + msgid "Filesystem is read only" +@@ -816,7 +811,6 @@ msgid "You do not have permission to save there" + msgstr "Þú hefur ekki nægar aðgangsheimildir til að vista þarna" + + #: ../src/exportViewDialog.js:160 +-#| msgid "The directory does not exists" + msgid "The directory does not exist" + msgstr "Mappan er ekki til" + +@@ -886,7 +880,6 @@ msgid "No earlier alternatives found." + msgstr "Engir fyrri möguleikar fundust." + + #: ../src/openTripPlanner.js:623 +-#| msgid "No route found." + msgid "No later alternatives found." + msgstr "Engir síðari möguleikar fundust." + +@@ -970,8 +963,8 @@ msgid "" + "The format used should include the language code and the article title like " + "“en:Article title”." + msgstr "" +-"Sniðið ætti að innihalda tungumálskóða og titil greinar, til dæmis \"is:Heiti " +-"greinar\"." ++"Sniðið ætti að innihalda tungumálskóða og titil greinar, til dæmis \"is:" ++"Heiti greinar\"." + + #: ../src/osmEditDialog.js:143 + msgid "Opening hours" +@@ -1045,7 +1038,7 @@ msgstr "Trúarbrögð" + + #: ../src/osmEditDialog.js:185 ../src/translations.js:363 + msgid "Animism" +-msgstr "" ++msgstr "Andatrú" + + #: ../src/osmEditDialog.js:186 + msgid "Bahá’í" +@@ -1057,7 +1050,7 @@ msgstr "Búddismi" + + #: ../src/osmEditDialog.js:188 ../src/translations.js:366 + msgid "Caodaism" +-msgstr "" ++msgstr "Kao-Daí" + + #: ../src/osmEditDialog.js:189 ../src/translations.js:367 + msgid "Christianity" +@@ -1065,7 +1058,7 @@ msgstr "Kristindómur" + + #: ../src/osmEditDialog.js:190 ../src/translations.js:368 + msgid "Confucianism" +-msgstr "" ++msgstr "Konfúsíusismi" + + #: ../src/osmEditDialog.js:191 ../src/translations.js:369 + msgid "Hinduism" +@@ -1073,7 +1066,7 @@ msgstr "Hindúismi" + + #: ../src/osmEditDialog.js:192 ../src/translations.js:370 + msgid "Jainism" +-msgstr "" ++msgstr "Jaínismi" + + #: ../src/osmEditDialog.js:193 ../src/translations.js:371 + msgid "Judaism" +@@ -1085,7 +1078,7 @@ msgstr "Íslam" + + #: ../src/osmEditDialog.js:195 ../src/translations.js:373 + msgid "Multiple Religions" +-msgstr "" ++msgstr "Margra trúarbragða" + + #: ../src/osmEditDialog.js:196 ../src/translations.js:374 + msgid "Paganism" +@@ -1093,7 +1086,7 @@ msgstr "Heiðni" + + #: ../src/osmEditDialog.js:197 ../src/translations.js:375 + msgid "Pastafarianism" +-msgstr "" ++msgstr "Pastafaríanismi" + + #: ../src/osmEditDialog.js:198 ../src/translations.js:376 + msgid "Scientology" +@@ -1117,7 +1110,7 @@ msgstr "Taóismi" + + #: ../src/osmEditDialog.js:203 ../src/translations.js:381 + msgid "Unitarian Universalism" +-msgstr "" ++msgstr "Alþjóðlegur únítarismi" + + #: ../src/osmEditDialog.js:204 ../src/translations.js:382 + msgid "Voodoo" +@@ -1125,11 +1118,11 @@ msgstr "Vúdú" + + #: ../src/osmEditDialog.js:205 ../src/translations.js:383 + msgid "Yazidism" +-msgstr "" ++msgstr "Jasismi" + + #: ../src/osmEditDialog.js:206 ../src/translations.js:384 + msgid "Zoroastrianism" +-msgstr "" ++msgstr "Sóróismi" + + #: ../src/osmEditDialog.js:209 + msgid "Toilets" +@@ -1145,6 +1138,9 @@ msgid "" + "an element, the author’s intent when creating it, or hints for further " + "improvement." + msgstr "" ++"Upplýsingar sem notaðar eru til að gefa öðrum kortahönnuðum ekki-augljósar " ++"ábendingar um tiltekið atriði, markmið höfundar þegar hann útbjó atriði, eða " ++"ábendingar um hvernig hægt yrði að þróa/bæta það." + + #: ../src/osmEditDialog.js:328 + msgctxt "dialog title" +@@ -1261,7 +1257,7 @@ msgid "failed to load file" + msgstr "mistókst að hlaða inn skrá" + + #. Translators: %s is a time expression with the format "%f h" or "%f min" +-#: ../src/sidebar.js:294 ++#: ../src/sidebar.js:293 + #, javascript-format + msgid "Estimated time: %s" + msgstr "Áætlaður tími: %s" +@@ -1291,7 +1287,6 @@ msgstr "Byrja í %s" + #. * an arbitrary point on the map) + #. + #: ../src/transitLegRow.js:79 +-#| msgid "Start!" + msgid "Start" + msgstr "Upphaf" + +@@ -1344,7 +1339,6 @@ msgstr "%s – %s" + #. + #: ../src/transitPlan.js:280 + #, javascript-format +-#| msgid "%f min" + msgid "%d minute" + msgid_plural "%d minutes" + msgstr[0] "%d mínúta" +-- +cgit v0.12 + diff --git a/gnome-maps-nb-translations.patch b/gnome-maps-nb-translations.patch new file mode 100644 index 0000000..3aae679 --- /dev/null +++ b/gnome-maps-nb-translations.patch @@ -0,0 +1,719 @@ +From 3471a20737794b89008376277fd5ddae6b34d8c2 Mon Sep 17 00:00:00 2001 +From: Kjartan Maraas +Date: Wed, 8 Nov 2017 19:59:07 +0100 +Subject: =?UTF-8?q?Updated=20Norwegian=20bokm=C3=A5l=20translation.?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + po/nb.po | 320 ++++++++++++++++++++++++++++++++++++++++++++++++--------------- + 1 file changed, 244 insertions(+), 76 deletions(-) + +diff --git a/po/nb.po b/po/nb.po +index 8caaa04..7818097 100644 +--- a/po/nb.po ++++ b/po/nb.po +@@ -7,10 +7,10 @@ + # + msgid "" + msgstr "" +-"Project-Id-Version: gnome-maps 3.24.x\n" ++"Project-Id-Version: gnome-maps 3.26.x\n" + "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-maps&keywords=I18N+L10N&component=general\n" +-"POT-Creation-Date: 2017-03-07 09:56+0000\n" +-"PO-Revision-Date: 2017-03-25 18:16+0100\n" ++"POT-Creation-Date: 2017-09-11 20:24+0000\n" ++"PO-Revision-Date: 2017-11-08 19:59+0100\n" + "Last-Translator: Kjartan Maraas \n" + "Language-Team: Norwegian bokmål \n" + "Language: nb\n" +@@ -59,7 +59,7 @@ msgstr "" + + #. Translators: This is the program name. + #: ../data/org.gnome.Maps.desktop.in.h:1 ../data/ui/main-window.ui.h:1 +-#: ../src/application.js:87 ../src/mainWindow.js:441 ++#: ../src/application.js:87 ../src/mainWindow.js:489 + msgid "Maps" + msgstr "Kart" + +@@ -188,6 +188,10 @@ msgstr "Brukernavn eller e-postadresse for OpenStreetMap" + msgid "Indicates if the user has signed in to edit OpenStreetMap data." + msgstr "Indikerer om bruker har logget inn for å redigere OpenStreeMap data." + ++#: ../data/org.gnome.Maps.gschema.xml.h:25 ++msgid "Last used transportation type for routing" ++msgstr "" ++ + #: ../data/ui/app-menu.ui.h:1 + msgid "Set up OpenStreetMap Account" + msgstr "Sett opp konto på OpenStreetMap" +@@ -222,7 +226,7 @@ msgid "_Cancel" + msgstr "_Avbryt" + + #. Translators: Check in is used as a verb +-#: ../data/ui/check-in-dialog.ui.h:5 ../data/ui/map-bubble.ui.h:5 ++#: ../data/ui/check-in-dialog.ui.h:5 ../data/ui/map-bubble.ui.h:8 + msgid "C_heck in" + msgstr "S_jekk inn" + +@@ -337,6 +341,22 @@ msgctxt "shortcut window" + msgid "Go to current location" + msgstr "Gå til gjeldende posisjon" + ++#: ../data/ui/help-overlay.ui.h:12 ++msgctxt "shortcut window" ++msgid "Switch to street view" ++msgstr "Bytt til gatevisning" ++ ++#: ../data/ui/help-overlay.ui.h:13 ++msgctxt "shortcut window" ++msgid "Switch to aerial view" ++msgstr "Bytt til flyvisning" ++ ++#: ../data/ui/help-overlay.ui.h:14 ++#, fuzzy ++msgctxt "shortcut window" ++msgid "Open shape layer" ++msgstr "Åpne lag" ++ + #: ../data/ui/layers-popover.ui.h:1 + msgid "Load Map Layer" + msgstr "Last kartlag" +@@ -349,31 +369,36 @@ msgstr "Skru på posisjonstjenester for å se hvor du er" + msgid "Location Settings" + msgstr "Posisjonsinnstillinger" + +-#: ../data/ui/main-window.ui.h:2 ++#. Translators: This is a tooltip ++#: ../data/ui/main-window.ui.h:3 + msgid "Go to current location" + msgstr "Gå til gjeldende posisjon" + +-#: ../data/ui/main-window.ui.h:3 ++#. Translators: This is a tooltip ++#: ../data/ui/main-window.ui.h:5 + msgid "Choose map type" + msgstr "Velg karttype" + +-#: ../data/ui/main-window.ui.h:4 ++#. Translators: This is a tooltip ++#: ../data/ui/main-window.ui.h:7 + msgid "Toggle route planner" + msgstr "Slå av/på ruteplanlegger" + +-#: ../data/ui/main-window.ui.h:5 ++#. Translators: This is a tooltip ++#: ../data/ui/main-window.ui.h:9 + msgid "Toggle favorites" + msgstr "Slå av/på favoritter" + +-#: ../data/ui/main-window.ui.h:6 ++#. Translators: This is a tooltip ++#: ../data/ui/main-window.ui.h:11 + msgid "Print Route" + msgstr "Skriv ut rute" + +-#: ../data/ui/main-window.ui.h:7 ++#: ../data/ui/main-window.ui.h:12 + msgid "Maps is offline!" + msgstr "Kart er frakoblet!" + +-#: ../data/ui/main-window.ui.h:8 ++#: ../data/ui/main-window.ui.h:13 + msgid "" + "Maps need an active internet connection to function properly, but one can’t " + "be found." +@@ -381,23 +406,27 @@ msgstr "" + "Kart trenger en aktiv internettforbindelse for å fungere, men ingen ble " + "funnet." + +-#: ../data/ui/main-window.ui.h:9 ++#: ../data/ui/main-window.ui.h:14 + msgid "Check your connection and proxy settings." + msgstr "Sjekk tilkobling og innstillinger for proxy." + +-#: ../data/ui/map-bubble.ui.h:1 ++#. Translators: This is a tooltip ++#: ../data/ui/map-bubble.ui.h:2 + msgid "Add to new route" + msgstr "Legg til i ny rute" + +-#: ../data/ui/map-bubble.ui.h:2 ++#. Translators: This is a tooltip ++#: ../data/ui/map-bubble.ui.h:4 + msgid "Open with another application" + msgstr "Åpne med et annet program" + +-#: ../data/ui/map-bubble.ui.h:3 ++#. Translators: This is a tooltip ++#: ../data/ui/map-bubble.ui.h:6 + msgid "Mark as favorite" + msgstr "Merk som favoritt" + +-#: ../data/ui/map-bubble.ui.h:6 ++#. Translators: This is a tooltip ++#: ../data/ui/map-bubble.ui.h:10 + msgid "Check in here" + msgstr "Sjekk inn her" + +@@ -515,6 +544,7 @@ msgid "Recently Used" + msgstr "Nylig brukt" + + #: ../data/ui/osm-edit-dialog.ui.h:8 ++msgctxt "dialog title" + msgid "Edit on OpenStreetMap" + msgstr "Rediger på OpenStreetMap" + +@@ -522,11 +552,17 @@ msgstr "Rediger på OpenStreetMap" + msgid "Cancel" + msgstr "Avbryt" + +-#: ../data/ui/osm-edit-dialog.ui.h:10 ../src/osmEditDialog.js:472 ++#: ../data/ui/osm-edit-dialog.ui.h:10 ../src/osmEditDialog.js:516 + msgid "Next" + msgstr "Neste" + +-#: ../data/ui/place-bubble.ui.h:1 ++#. Translators: This is a tooltip ++#: ../data/ui/place-bubble.ui.h:2 ++msgid "Edit on OpenStreetMap" ++msgstr "Rediger på OpenStreetMap" ++ ++#. Translators: This is a tooltip ++#: ../data/ui/place-bubble.ui.h:4 + msgid "Show more information" + msgstr "Vis mer informasjon" + +@@ -534,7 +570,12 @@ msgstr "Vis mer informasjon" + msgid "Press enter to search" + msgstr "Trykk linjeskift for å søke" + +-#: ../data/ui/route-entry.ui.h:1 ++#: ../data/ui/place-popover.ui.h:2 ++msgid "No results found" ++msgstr "Ingen resultater funnet" ++ ++#. Translators: This is a tooltip ++#: ../data/ui/route-entry.ui.h:2 + msgid "Drag to change order of the route" + msgstr "Dra for å endre rekkefølgen på ruten" + +@@ -550,7 +591,8 @@ msgstr "_Åpne" + msgid "Open Layer" + msgstr "Åpne lag" + +-#: ../data/ui/shape-layer-row.ui.h:1 ++#. Translators: This is a tooltip ++#: ../data/ui/shape-layer-row.ui.h:2 + msgid "Toggle visible" + msgstr "Slå av/på synlige" + +@@ -577,11 +619,13 @@ msgstr "" + msgid "Show more results" + msgstr "Vis flere resultater" + +-#: ../data/ui/transit-leg-row.ui.h:1 ++#. Translators: This is a tooltip ++#: ../data/ui/transit-leg-row.ui.h:2 + msgid "Hide intermediate stops and information" + msgstr "Skjul stopp og informasjon langs ruten" + +-#: ../data/ui/transit-leg-row.ui.h:2 ++#. Translators: This is a tooltip ++#: ../data/ui/transit-leg-row.ui.h:4 + msgid "Show intermediate stops and information" + msgstr "Vis stopp og informasjon på veien" + +@@ -660,7 +704,7 @@ msgstr "Mangler nødvendige attributter" + msgid "Could not find OSM element" + msgstr "Fant ikke OSM-element" + +-#: ../src/application.js:103 ++#: ../src/application.js:102 + msgid "A path to a local tiles directory structure" + msgstr "En sti til en lokal katalogstruktur med fliser" + +@@ -706,22 +750,22 @@ msgstr "Sjekk inn på %s" + msgid "Write an optional message to check in to %s." + msgstr "Skriv en valgfri melding for å sjekke inn ved %s." + +-#: ../src/checkInDialog.js:288 ../src/checkIn.js:153 +-#: ../src/osmEditDialog.js:509 ++#: ../src/checkInDialog.js:288 ../src/checkIn.js:165 ++#: ../src/osmEditDialog.js:553 + msgid "An error has occurred" + msgstr "Det har oppstått en feil" + + #. Translators: %s is the place name that user wanted to check-in +-#: ../src/checkIn.js:135 ++#: ../src/checkIn.js:147 + #, javascript-format + msgid "Cannot find “%s” in the social service" + msgstr "Finner ikke «%s» i sosial tjeneste" + +-#: ../src/checkIn.js:137 ++#: ../src/checkIn.js:149 + msgid "Cannot find a suitable place to check-in in this location" + msgstr "Fant ingen passende steder å sjekke inn på denne posisjonen" + +-#: ../src/checkIn.js:141 ++#: ../src/checkIn.js:153 + msgid "" + "Credentials have expired, please open Online Accounts to sign in and enable " + "this account" +@@ -729,23 +773,23 @@ msgstr "" + "Akkreditiver er utgått. Åpne Nettkontoer for å logge inn og bruke denne " + "kontoen" + +-#: ../src/contextMenu.js:96 ++#: ../src/contextMenu.js:99 + msgid "Route from here" + msgstr "Rute fra denne lokasjonen" + +-#: ../src/contextMenu.js:98 ++#: ../src/contextMenu.js:101 + msgid "Add destination" + msgstr "Legg til mål" + +-#: ../src/contextMenu.js:100 ++#: ../src/contextMenu.js:103 + msgid "Route to here" + msgstr "Rute til denne lokasjonen" + +-#: ../src/contextMenu.js:129 ++#: ../src/contextMenu.js:132 + msgid "Nothing found here!" + msgstr "Ingenting her!" + +-#: ../src/contextMenu.js:186 ++#: ../src/contextMenu.js:189 + msgid "" + "Location was added to the map, note that it may take a while before it shows " + "on the map and in search results." +@@ -786,12 +830,11 @@ msgstr "lesefeil" + msgid "unknown geometry" + msgstr "ukjent geometri" + +-#: ../src/graphHopper.js:93 ../src/openTripPlanner.js:630 ++#: ../src/graphHopper.js:93 ../src/openTripPlanner.js:665 + msgid "Route request failed." + msgstr "Forespørsel om rute feilet." + +-#: ../src/graphHopper.js:101 ../src/openTripPlanner.js:614 +-#: ../src/openTripPlanner.js:728 ++#: ../src/graphHopper.js:101 ../src/openTripPlanner.js:628 + msgid "No route found." + msgstr "Ingen rute funnet." + +@@ -799,37 +842,45 @@ msgstr "Ingen rute funnet." + msgid "Start!" + msgstr "Start!" + +-#: ../src/layersPopover.js:62 ++#: ../src/mainWindow.js:59 + msgid "All Layer Files" + msgstr "Alle lagfiler" + +-#: ../src/mainWindow.js:387 ++#: ../src/mainWindow.js:431 + msgid "Failed to connect to location service" + msgstr "Klarte ikke å koble til posisjonstjeneste" + +-#: ../src/mainWindow.js:439 ++#: ../src/mainWindow.js:487 + msgid "translator-credits" + msgstr "" + "haarek , Kjartan Maraas , Åka " + "Sikrom " + +-#: ../src/mainWindow.js:442 ++#: ../src/mainWindow.js:490 + msgid "A map application for GNOME" + msgstr "Et kartprogram for GNOME" + +-#: ../src/mapView.js:354 ++#: ../src/mapView.js:356 + msgid "File type is not supported" + msgstr "Filtypen er ikke støttet" + +-#: ../src/mapView.js:361 ++#: ../src/mapView.js:363 + msgid "Failed to open layer" + msgstr "Klarte ikke å åpne lag" + +-#: ../src/mapView.js:397 ++#: ../src/mapView.js:399 + msgid "Failed to open GeoURI" + msgstr "Klarte ikke å åpne GeoURI" + +-#: ../src/openTripPlanner.js:626 ++#: ../src/openTripPlanner.js:622 ++msgid "No earlier alternatives found." ++msgstr "Ingen tidligere alternativer funnet." ++ ++#: ../src/openTripPlanner.js:623 ++msgid "No later alternatives found." ++msgstr "Ingen senere alternativer funnet." ++ ++#: ../src/openTripPlanner.js:661 + msgid "No timetable data found for this route." + msgstr "Ingen ruteinformasjon funnet for denne ruten." + +@@ -875,7 +926,7 @@ msgstr "Det offisielle navnet. Dette er typisk det som vises på skilt." + msgid "Address" + msgstr "Adresse" + +-#: ../src/osmEditDialog.js:118 ../src/placeBubble.js:159 ++#: ../src/osmEditDialog.js:118 + msgid "Website" + msgstr "Nettsted" + +@@ -900,7 +951,7 @@ msgstr "" + "Vær observant på lokale lover om personvern, spesielt for private " + "telefonnummer." + +-#: ../src/osmEditDialog.js:135 ../src/placeBubble.js:165 ++#: ../src/osmEditDialog.js:135 ../src/placeBubble.js:170 + msgid "Wikipedia" + msgstr "Wikipedia" + +@@ -916,7 +967,7 @@ msgstr "Åpningstider" + + #: ../src/osmEditDialog.js:148 + msgid "See the link in the label for help on format." +-msgstr "" ++msgstr "Se lenken i etiketten for hjelp om format." + + #: ../src/osmEditDialog.js:151 + msgid "Population" +@@ -935,10 +986,12 @@ msgid "Wheelchair access" + msgstr "Rullestolvennlig" + + #: ../src/osmEditDialog.js:165 ../src/osmEditDialog.js:174 ++#: ../src/osmEditDialog.js:212 + msgid "Yes" + msgstr "Ja" + + #: ../src/osmEditDialog.js:166 ../src/osmEditDialog.js:175 ++#: ../src/osmEditDialog.js:213 + msgid "No" + msgstr "Nei" + +@@ -973,16 +1026,123 @@ msgstr "Terminal" + msgid "Service" + msgstr "Tjeneste" + +-#: ../src/osmEditDialog.js:288 ++#: ../src/osmEditDialog.js:182 ++msgid "Religion" ++msgstr "Religion" ++ ++#: ../src/osmEditDialog.js:185 ../src/translations.js:363 ++msgid "Animism" ++msgstr "Animisme" ++ ++#: ../src/osmEditDialog.js:186 ++msgid "Bahá’í" ++msgstr "Bahá’í" ++ ++#: ../src/osmEditDialog.js:187 ../src/translations.js:365 ++msgid "Buddhism" ++msgstr "Buddisme" ++ ++#: ../src/osmEditDialog.js:188 ../src/translations.js:366 ++msgid "Caodaism" ++msgstr "" ++ ++#: ../src/osmEditDialog.js:189 ../src/translations.js:367 ++msgid "Christianity" ++msgstr "Kristendom" ++ ++#: ../src/osmEditDialog.js:190 ../src/translations.js:368 ++msgid "Confucianism" ++msgstr "Konfusianisme" ++ ++#: ../src/osmEditDialog.js:191 ../src/translations.js:369 ++msgid "Hinduism" ++msgstr "Hinduisme" ++ ++#: ../src/osmEditDialog.js:192 ../src/translations.js:370 ++msgid "Jainism" ++msgstr "Jainisme" ++ ++#: ../src/osmEditDialog.js:193 ../src/translations.js:371 ++msgid "Judaism" ++msgstr "Jødedom" ++ ++#: ../src/osmEditDialog.js:194 ../src/translations.js:372 ++msgid "Islam" ++msgstr "Islam" ++ ++#: ../src/osmEditDialog.js:195 ../src/translations.js:373 ++msgid "Multiple Religions" ++msgstr "Flere religioner" ++ ++#: ../src/osmEditDialog.js:196 ../src/translations.js:374 ++msgid "Paganism" ++msgstr "Paganisme" ++ ++#: ../src/osmEditDialog.js:197 ../src/translations.js:375 ++msgid "Pastafarianism" ++msgstr "" ++ ++#: ../src/osmEditDialog.js:198 ../src/translations.js:376 ++msgid "Scientology" ++msgstr "Scientologi" ++ ++#: ../src/osmEditDialog.js:199 ../src/translations.js:377 ++msgid "Shinto" ++msgstr "Shinto" ++ ++#: ../src/osmEditDialog.js:200 ../src/translations.js:378 ++msgid "Sikhism" ++msgstr "Sikdom" ++ ++#: ../src/osmEditDialog.js:201 ../src/translations.js:379 ++msgid "Spiritualism" ++msgstr "Spiritualisme" ++ ++#: ../src/osmEditDialog.js:202 ../src/translations.js:380 ++msgid "Taoism" ++msgstr "Taoisme" ++ ++#: ../src/osmEditDialog.js:203 ../src/translations.js:381 ++msgid "Unitarian Universalism" ++msgstr "" ++ ++#: ../src/osmEditDialog.js:204 ../src/translations.js:382 ++msgid "Voodoo" ++msgstr "Voodo" ++ ++#: ../src/osmEditDialog.js:205 ../src/translations.js:383 ++msgid "Yazidism" ++msgstr "" ++ ++#: ../src/osmEditDialog.js:206 ../src/translations.js:384 ++msgid "Zoroastrianism" ++msgstr "" ++ ++#: ../src/osmEditDialog.js:209 ++msgid "Toilets" ++msgstr "Toaletter" ++ ++#: ../src/osmEditDialog.js:216 ++msgid "Note" ++msgstr "Merknad" ++ ++#: ../src/osmEditDialog.js:219 ++msgid "" ++"Information used to inform other mappers about non-obvious information about " ++"an element, the author’s intent when creating it, or hints for further " ++"improvement." ++msgstr "" ++ ++#: ../src/osmEditDialog.js:328 + msgctxt "dialog title" + msgid "Add to OpenStreetMap" + msgstr "Legg til på OpenStreetMap" + +-#: ../src/osmEditDialog.js:340 ++#: ../src/osmEditDialog.js:381 + msgid "Select Type" + msgstr "Velg type" + +-#: ../src/osmEditDialog.js:458 ++#: ../src/osmEditDialog.js:500 + msgid "Done" + msgstr "Ferdig" + +@@ -1003,10 +1163,18 @@ msgid "Internet access:" + msgstr "Internettaksess:" + + #: ../src/placeBubble.js:143 ++msgid "Religion:" ++msgstr "Religion:" ++ ++#: ../src/placeBubble.js:148 ++msgid "Toilets:" ++msgstr "Toaletter:" ++ ++#: ../src/placeBubble.js:153 + msgid "Wheelchair access:" + msgstr "Rullestolvennlig:" + +-#: ../src/placeBubble.js:149 ../src/placeBubble.js:153 ++#: ../src/placeBubble.js:159 ../src/placeBubble.js:163 + msgid "Phone:" + msgstr "Telefon:" + +@@ -1020,7 +1188,7 @@ msgstr "Klarte ikke å tolke Geo-URI" + #. Translators: + #. * There is public internet access but the particular kind is unknown. + #. +-#: ../src/place.js:178 ../src/translations.js:329 ++#: ../src/place.js:219 ../src/translations.js:329 ../src/translations.js:391 + msgid "yes" + msgstr "ja" + +@@ -1029,7 +1197,7 @@ msgstr "ja" + #. * can be accessed and others not, areas requiring assistance + #. * by someone pushing up a steep gradient). + #. +-#: ../src/place.js:185 ++#: ../src/place.js:226 + msgid "limited" + msgstr "begrenset" + +@@ -1041,7 +1209,7 @@ msgstr "begrenset" + #. * no internet access is offered in a place where + #. * someone might expect it. + #. +-#: ../src/place.js:191 ../src/translations.js:335 ++#: ../src/place.js:232 ../src/translations.js:335 ../src/translations.js:392 + msgid "no" + msgstr "nei" + +@@ -1050,7 +1218,7 @@ msgstr "nei" + #. * for wheelchairs (e.g. elevators designed for wheelchair access + #. * only). This is rarely used. + #. +-#: ../src/place.js:198 ++#: ../src/place.js:239 + msgid "designated" + msgstr "spesialtilpasset" + +@@ -1080,7 +1248,7 @@ msgid "failed to load file" + msgstr "klarte ikke å laste fil" + + #. Translators: %s is a time expression with the format "%f h" or "%f min" +-#: ../src/sidebar.js:285 ++#: ../src/sidebar.js:294 + #, javascript-format + msgid "Estimated time: %s" + msgstr "Estimert tid: %s" +@@ -1100,7 +1268,7 @@ msgstr "Ankom" + #. Translators: this is a format string indicating instructions + #. * starting a journey at the address given as the parameter + #. +-#: ../src/transitLegRow.js:74 ++#: ../src/transitLegRow.js:73 + #, javascript-format + msgid "Start at %s" + msgstr "Start ved %s" +@@ -1109,22 +1277,22 @@ msgstr "Start ved %s" + #. * with no set name (such as when the user started routing from + #. * an arbitrary point on the map) + #. +-#: ../src/transitLegRow.js:80 ++#: ../src/transitLegRow.js:79 + msgid "Start" + msgstr "Start" + +-#: ../src/transitLegRow.js:108 ++#: ../src/transitLegRow.js:107 + msgid "Show walking instructions" + msgstr "Vis instruksjoner for fotgjengere" + +-#: ../src/transitLegRow.js:109 ++#: ../src/transitLegRow.js:108 + msgid "Hide walking instructions" + msgstr "Skjul instruksjoner for fotgjengere" + + #. Translators: this is a format string indicating walking a certain + #. * distance, with the distance expression being the %s placeholder + #. +-#: ../src/transitLegRow.js:134 ++#: ../src/transitLegRow.js:133 + #, javascript-format + msgid "Walk %s" + msgstr "Gå %s" +@@ -1141,7 +1309,7 @@ msgstr "Last senere alternativer" + #. * Translators: this is a format string giving the equivalent to + #. * "may 29" according to the current locale's convensions. + #. +-#: ../src/transitOptionsPanel.js:141 ++#: ../src/transitOptionsPanel.js:142 + msgctxt "month-day-date" + msgid "%b %e" + msgstr "%b %e" +@@ -1151,7 +1319,7 @@ msgstr "%b %e" + #. * "12:00 – 13:03" where the placeholder %s are the actual times, + #. * these could be rearranged if needed. + #. +-#: ../src/transitPlan.js:248 ++#: ../src/transitPlan.js:253 + #, javascript-format + msgid "%s – %s" + msgstr "%s – %s" +@@ -1160,7 +1328,7 @@ msgstr "%s – %s" + #. * less than an hour, with only the minutes part, using plural forms + #. * as appropriate + #. +-#: ../src/transitPlan.js:275 ++#: ../src/transitPlan.js:280 + #, javascript-format + msgid "%d minute" + msgid_plural "%d minutes" +@@ -1171,7 +1339,7 @@ msgstr[1] "%d minutter" + #. * where the duration is an exact number of hours (i.e. no + #. * minutes part), using plural forms as appropriate + #. +-#: ../src/transitPlan.js:286 ++#: ../src/transitPlan.js:291 + #, javascript-format + msgid "%d hour" + msgid_plural "%d hours" +@@ -1182,7 +1350,7 @@ msgstr[1] "%d timer" + #. * where the duration contains an hour and minute part, it's + #. * pluralized on the hours part + #. +-#: ../src/transitPlan.js:292 ++#: ../src/transitPlan.js:297 + #, javascript-format + msgid "%d:%02d hour" + msgid_plural "%d:%02d hours" +@@ -1195,7 +1363,7 @@ msgstr[1] "%d:%02d timer" + #. * "12:00–13:03" where the placeholder %s are the actual times, + #. * these could be rearranged if needed. + #. +-#: ../src/transitPlan.js:611 ++#: ../src/transitPlan.js:649 + #, javascript-format + msgid "%s–%s" + msgstr "%s–%s" +@@ -1376,23 +1544,23 @@ msgstr "%f s" + #. Translators: This is a distance measured in kilometers + #: ../src/utils.js:352 + #, javascript-format +-msgid "%f km" +-msgstr "%f km" ++msgid "%s km" ++msgstr "%s km" + + #. Translators: This is a distance measured in meters + #: ../src/utils.js:355 + #, javascript-format +-msgid "%f m" +-msgstr "%f m" ++msgid "%s m" ++msgstr "%s m" + + #. Translators: This is a distance measured in miles + #: ../src/utils.js:363 + #, javascript-format +-msgid "%f mi" +-msgstr "%f mil" ++msgid "%s mi" ++msgstr "%s mi" + + #. Translators: This is a distance measured in feet + #: ../src/utils.js:366 + #, javascript-format +-msgid "%f ft" +-msgstr "%f fot" ++msgid "%s ft" ++msgstr "%s ft" +-- +cgit v0.12 + diff --git a/gnome-maps.changes b/gnome-maps.changes index 2416d2a..f4c9c3b 100644 --- a/gnome-maps.changes +++ b/gnome-maps.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Dec 22 08:49:07 UTC 2017 - zaitor@opensuse.org + +- Add gnome-maps-is-translations.patch: Update Icelandic + translations. +- Add gnome-maps-nb-translations.patch: Update Norwegian Bokmål + translations. +- Clean up spec, use modern macros. +- Add lang package Recommends. + ------------------------------------------------------------------- Wed Nov 1 09:48:06 UTC 2017 - dimstar@opensuse.org diff --git a/gnome-maps.spec b/gnome-maps.spec index 9e94837..720ccaa 100644 --- a/gnome-maps.spec +++ b/gnome-maps.spec @@ -24,6 +24,11 @@ License: GPL-2.0+ Group: System/GUI/GNOME Url: https://live.gnome.org/Design/Apps/Maps Source: http://download.gnome.org/sources/gnome-maps/3.26/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM gnome-maps-is-translations.patch zaitor@opensuse.org -- Update Icelandic translations +Patch0: gnome-maps-is-translations.patch +# PATCH-FIX-UPSTREAM gnome-maps-nb-translations.patch zaitor@opensuse.org -- Update Norwegian Bokmål translations +Patch1: gnome-maps-nb-translations.patch + # Needed for typelib() Requires BuildRequires: gobject-introspection BuildRequires: hicolor-icon-theme @@ -40,9 +45,8 @@ BuildRequires: pkgconfig(gobject-introspection-1.0) >= 0.10.1 BuildRequires: pkgconfig(gtk+-3.0) >= 3.22.0 BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(rest-0.7) >= 0.7.90 - Recommends: dbus(org.freedesktop.GeoClue2) -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Recommends: %{name}-lang %glib2_gsettings_schema_requires %description @@ -51,12 +55,13 @@ OpenStreetMaps and satellite imagery from Mapbox. You can also get directions for your journeys, whether on foot, by bike, or by car. %lang_package + %prep -%setup -q +%autosetup -p1 %build %configure --disable-static -make %{?_smp_mflags} +%make_build %install %make_install @@ -67,7 +72,6 @@ find %{buildroot}%{_libdir} -name '*.la' -delete -print rm %{buildroot}%{_datadir}/gir-1.0/GnomeMaps-1.0.gir %files -%defattr(-,root,root) %{_bindir}/%{name} %dir %{_datadir}/appdata %{_datadir}/appdata/org.gnome.Maps.appdata.xml