Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gnome-maps for openSUSE:Factory checked in at 2021-01-15 19:44:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-maps (Old) and /work/SRC/openSUSE:Factory/.gnome-maps.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-maps" Fri Jan 15 19:44:39 2021 rev:56 rq:862312 version:3.38.3 Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-maps/gnome-maps.changes 2020-11-29 12:22:11.489623695 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-maps.new.28504/gnome-maps.changes 2021-01-15 19:44:51.901900047 +0100 @@ -1,0 +2,16 @@ +Sat Jan 9 17:25:27 UTC 2021 - Bj??rn Lie <bjorn....@gmail.com> + +- Update to version 3.38.3: + + Fix a bug where place details gets lost after searching again + for the same place. + + Updated translations. + +------------------------------------------------------------------- +Mon Dec 21 14:25:18 UTC 2020 - Bj??rn Lie <bjorn....@gmail.com> + +- Add check section and run meson_test macro. Add + pkgconfig(gweather-3.0) BuildRequires needed for tests to + succeed. +- Stop packaging versionless so file to avoid rpmlint warning. + +------------------------------------------------------------------- Old: ---- gnome-maps-3.38.2.tar.xz New: ---- gnome-maps-3.38.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-maps.spec ++++++ --- /var/tmp/diff_new_pack.J8hJ9V/_old 2021-01-15 19:44:52.325900678 +0100 +++ /var/tmp/diff_new_pack.J8hJ9V/_new 2021-01-15 19:44:52.329900684 +0100 @@ -1,7 +1,7 @@ # # spec file for package gnome-maps # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: gnome-maps -Version: 3.38.2 +Version: 3.38.3 Release: 0 Summary: Maps Application for GNOME License: GPL-2.0-or-later @@ -27,6 +27,7 @@ # Needed for typelib() Requires BuildRequires: gobject-introspection +# BuildRequires: hicolor-icon-theme BuildRequires: intltool >= 0.40.0 BuildRequires: meson @@ -41,6 +42,9 @@ BuildRequires: pkgconfig(gjs-1.0) >= 1.50.0 BuildRequires: pkgconfig(gobject-introspection-1.0) >= 0.10.1 BuildRequires: pkgconfig(gtk+-3.0) >= 3.22.0 +# Needed for test run +BuildRequires: pkgconfig(gweather-3.0) +# BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(rest-0.7) >= 0.7.90 Recommends: dbus(org.freedesktop.GeoClue2) @@ -59,12 +63,16 @@ %meson %meson_build +%check +%meson_test + %install %meson_install %find_lang %{name} %{?no_lang_C} %suse_update_desktop_file -G "Maps Application" org.gnome.Maps DesktopUtility -# There is no devel file, so at this moment also no need to keep +# There is no devel package, so at this moment also no need to keep gir and so files rm %{buildroot}%{_datadir}/gnome-maps/gir-1.0/GnomeMaps-1.0.gir +rm %{buildroot}%{_libdir}/%{name}/libgnome-maps.so %files %license COPYING @@ -77,7 +85,10 @@ %{_datadir}/%{name}/ %{_datadir}/icons/hicolor/*/apps/org.gnome.Maps* %{_datadir}/glib-2.0/schemas/org.gnome.Maps.gschema.xml -%{_libdir}/%{name}/ +%{_libdir}/%{name}/libgnome-maps.so.0* +%dir %{_libdir}/%{name} +%dir %{_libdir}/%{name}/girepository-1.0 +%{_libdir}/%{name}/girepository-1.0/GnomeMaps-1.0.typelib %files lang -f %{name}.lang ++++++ gnome-maps-3.38.2.tar.xz -> gnome-maps-3.38.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-maps-3.38.2/NEWS new/gnome-maps-3.38.3/NEWS --- old/gnome-maps-3.38.2/NEWS 2020-11-21 14:24:38.726244700 +0100 +++ new/gnome-maps-3.38.3/NEWS 2021-01-09 14:47:08.933076600 +0100 @@ -1,3 +1,17 @@ +3.38.3 - Jan 9, 2021 +========================= + +Changes since 3.38.2 + - Fix a bug where place details gets lost after searching again for the same + place + +Added/updated/fixed translations + - Norwegian Bokm??l + +All contributors to this release +Kjartan Maraas <kmar...@gnome.org> +Marcus Lundblad <m...@update.uu.se> + 3.38.2 - Nov 21, 2020 ========================= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-maps-3.38.2/data/org.gnome.Maps.appdata.xml.in new/gnome-maps-3.38.3/data/org.gnome.Maps.appdata.xml.in --- old/gnome-maps-3.38.2/data/org.gnome.Maps.appdata.xml.in 2020-11-21 14:24:38.734244000 +0100 +++ new/gnome-maps-3.38.3/data/org.gnome.Maps.appdata.xml.in 2021-01-09 14:47:08.941075800 +0100 @@ -42,6 +42,11 @@ </screenshot> </screenshots> <releases> + <release date="2021-01-09" version="3.38.3"> + <ul> + <li>Fix a bug where place details gets lost after searching again for the same place</li> + </ul> + </release> <release date="2020-11-21" version="3.38.2"> <ul>Translation updates</ul> </release> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-maps-3.38.2/meson.build new/gnome-maps-3.38.3/meson.build --- old/gnome-maps-3.38.2/meson.build 2020-11-21 14:24:38.762241600 +0100 +++ new/gnome-maps-3.38.3/meson.build 2021-01-09 14:47:08.969073500 +0100 @@ -1,5 +1,5 @@ project('gnome-maps', 'c', - version: '3.38.2', + version: '3.38.3', license: 'GPL2+' ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-maps-3.38.2/po/nb.po new/gnome-maps-3.38.3/po/nb.po --- old/gnome-maps-3.38.2/po/nb.po 2020-11-21 14:24:38.786239600 +0100 +++ new/gnome-maps-3.38.3/po/nb.po 2021-01-09 14:47:08.985072100 +0100 @@ -7,10 +7,10 @@ # msgid "" msgstr "" -"Project-Id-Version: gnome-maps 3.36.x\n" +"Project-Id-Version: gnome-maps 3.38.x\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-maps/issues\n" -"POT-Creation-Date: 2020-01-30 20:30+0000\n" -"PO-Revision-Date: 2020-03-09 18:18+0100\n" +"POT-Creation-Date: 2020-09-16 21:00+0000\n" +"PO-Revision-Date: 2020-12-04 15:36+0100\n" "Last-Translator: Kjartan Maraas <kmar...@gnome.org>\n" "Language-Team: Norwegian bokm??l <i18n...@lister.ping.uio.no>\n" "Language: nb\n" @@ -57,7 +57,7 @@ "Du kan ogs?? s??ke etter en bestemt type sted, som f.eks. ??Pub n??r Main " "Street, Boston?? eller ??Hoteller n??r Alexanderplatz, Berlin??." -#: data/org.gnome.Maps.appdata.xml.in:92 +#: data/org.gnome.Maps.appdata.xml.in:159 msgid "The GNOME Project" msgstr "GNOME prosjektet" @@ -69,8 +69,8 @@ #. * overview. #. #. Translators: This is the program name. -#: data/org.gnome.Maps.desktop.in:4 data/ui/main-window.ui:30 -#: src/application.js:81 src/mainWindow.js:141 src/mainWindow.js:550 +#: data/org.gnome.Maps.desktop.in:4 data/ui/main-window.ui:34 +#: src/application.js:81 src/mainWindow.js:129 src/mainWindow.js:567 msgid "Maps" msgstr "Kart" @@ -221,6 +221,22 @@ msgid "Last used transportation type for routing" msgstr "Sist brukte transporttype for ruting" +#: data/org.gnome.Maps.gschema.xml:86 +msgid "Night mode" +msgstr "Nattmodus" + +#: data/org.gnome.Maps.gschema.xml:87 +msgid "Whether the application is in night mode." +msgstr "Hvorvidt programmet vises i nattmodus." + +#: data/org.gnome.Maps.gschema.xml:91 +msgid "Use hybrid aerial tiles" +msgstr "" + +#: data/org.gnome.Maps.gschema.xml:92 +msgid "Whether aerial tiles should use hybrid style (with labels)." +msgstr "" + #: data/ui/check-in-dialog.ui:250 data/ui/check-in-dialog.ui:299 msgid "Visibility" msgstr "Synlighet" @@ -307,6 +323,41 @@ msgid "Include route and markers" msgstr "Ta med rute og mark??rer" +#. Translators: This is a tooltip +#: data/ui/headerbar-left.ui:15 +msgid "Go to current location" +msgstr "G?? til gjeldende posisjon" + +#. Translators: This is a tooltip +#: data/ui/headerbar-left.ui:36 +msgid "Choose map type" +msgstr "Velg karttype" + +#. Translators: This is a tooltip +#: data/ui/headerbar-left.ui:61 +msgid "Zoom out" +msgstr "Zoom ut" + +#. Translators: This is a tooltip +#: data/ui/headerbar-left.ui:77 +msgid "Zoom in" +msgstr "Zoom inn" + +#. Translators: This is a tooltip +#: data/ui/headerbar-right.ui:16 +msgid "Toggle route planner" +msgstr "Sl?? av/p?? ruteplanlegger" + +#. Translators: This is a tooltip +#: data/ui/headerbar-right.ui:37 +msgid "Toggle favorites" +msgstr "Sl?? av/p?? favoritter" + +#. Translators: This is a tooltip +#: data/ui/headerbar-right.ui:57 +msgid "Print Route" +msgstr "Skriv ut rute" + #: data/ui/help-overlay.ui:14 msgctxt "shortcut window" msgid "General" @@ -337,48 +388,57 @@ msgid "Quit" msgstr "Avslutt" -#: data/ui/help-overlay.ui:55 +#: data/ui/help-overlay.ui:53 +msgctxt "shortcut window" +msgid "Open main menu" +msgstr "??pne hovedmeny" + +#: data/ui/help-overlay.ui:62 msgctxt "shortcut window" msgid "Map View" msgstr "Kartvisning" -#: data/ui/help-overlay.ui:59 +#: data/ui/help-overlay.ui:66 msgctxt "shortcut window" msgid "Zoom in" msgstr "Zoom inn" -#: data/ui/help-overlay.ui:66 +#: data/ui/help-overlay.ui:73 msgctxt "shortcut window" msgid "Zoom out" msgstr "Zoom ut" -#: data/ui/help-overlay.ui:73 +#: data/ui/help-overlay.ui:80 msgctxt "shortcut window" msgid "Toggle scale" msgstr "Sl?? av/p?? skala" -#: data/ui/help-overlay.ui:80 +#: data/ui/help-overlay.ui:87 msgctxt "shortcut window" msgid "Go to current location" msgstr "G?? til gjeldende posisjon" -#: data/ui/help-overlay.ui:87 +#: data/ui/help-overlay.ui:94 msgctxt "shortcut window" msgid "Switch to street view" msgstr "Bytt til gatevisning" -#: data/ui/help-overlay.ui:94 +#: data/ui/help-overlay.ui:101 msgctxt "shortcut window" msgid "Switch to aerial view" msgstr "Bytt til flyvisning" -#: data/ui/help-overlay.ui:101 +#: data/ui/help-overlay.ui:108 msgctxt "shortcut window" msgid "Open shape layer" msgstr "??pne formlag" +#: data/ui/layers-popover.ui:65 +msgid "Show Labels" +msgstr "Vis etiketter" + #. Translators: This string uses ellipsis character -#: data/ui/layers-popover.ui:69 +#: data/ui/layers-popover.ui:102 msgid "Open Shape Layer???" msgstr "??pne formlag ???" @@ -396,61 +456,34 @@ msgstr "Posisjonsinnstillinger" #: data/ui/main-window.ui:8 +msgid "Night Mode" +msgstr "Nattmodus" + +#: data/ui/main-window.ui:12 msgid "Set up OpenStreetMap Account" msgstr "Sett opp konto p?? OpenStreetMap" -#: data/ui/main-window.ui:12 +#: data/ui/main-window.ui:16 msgid "Export as Image" msgstr "Eksporter som bilde" -#: data/ui/main-window.ui:17 +#: data/ui/main-window.ui:21 msgid "_Keyboard Shortcuts" msgstr "_Tastatursnarveier" -#: data/ui/main-window.ui:22 +#: data/ui/main-window.ui:26 msgid "About Maps" msgstr "Om Kart" -#. Translators: This is a tooltip -#: data/ui/main-window.ui:45 -msgid "Go to current location" -msgstr "G?? til gjeldende posisjon" +#: data/ui/main-window.ui:52 +msgid "Open main menu" +msgstr "??pne hovedmeny" -#. Translators: This is a tooltip -#: data/ui/main-window.ui:66 -msgid "Choose map type" -msgstr "Velg karttype" - -#. Translators: This is a tooltip -#: data/ui/main-window.ui:91 -msgid "Zoom out" -msgstr "Zoom ut" - -#. Translators: This is a tooltip -#: data/ui/main-window.ui:107 -msgid "Zoom in" -msgstr "Zoom inn" - -#. Translators: This is a tooltip -#: data/ui/main-window.ui:146 -msgid "Toggle route planner" -msgstr "Sl?? av/p?? ruteplanlegger" - -#. Translators: This is a tooltip -#: data/ui/main-window.ui:167 -msgid "Toggle favorites" -msgstr "Sl?? av/p?? favoritter" - -#. Translators: This is a tooltip -#: data/ui/main-window.ui:187 -msgid "Print Route" -msgstr "Skriv ut rute" - -#: data/ui/main-window.ui:250 +#: data/ui/main-window.ui:114 msgid "Maps is offline!" msgstr "Kart er frakoblet!" -#: data/ui/main-window.ui:260 +#: data/ui/main-window.ui:122 msgid "" "Maps need an active internet connection to function properly, but one can???t " "be found." @@ -458,7 +491,7 @@ "Kart trenger en aktiv internettforbindelse for ?? fungere, men ingen ble " "funnet." -#: data/ui/main-window.ui:269 +#: data/ui/main-window.ui:130 msgid "Check your connection and proxy settings." msgstr "Sjekk tilkobling og innstillinger for proxy." @@ -508,15 +541,15 @@ msgstr "Passord" #: data/ui/osm-account-dialog.ui:125 +msgid "Sign up" +msgstr "Registrer deg" + +#: data/ui/osm-account-dialog.ui:139 msgid "Sign In" msgstr "Logg inn" -#: data/ui/osm-account-dialog.ui:146 -msgid "Don???t have an account?" -msgstr "Har du ikke en konto?" - #. The label should contain the link to the OSM reset password page with a translated title -#: data/ui/osm-account-dialog.ui:159 +#: data/ui/osm-account-dialog.ui:162 msgid "" "Sorry, that didn???t work. Please try again, or visit\n" "<a href=\"https://www.openstreetmap.org/user/forgot-password" @@ -526,27 +559,27 @@ "<a href=\"https://www.openstreetmap.org/user/forgot-password" "\">OpenStreetMap</a> for ?? nullstille passordet ditt." -#: data/ui/osm-account-dialog.ui:172 +#: data/ui/osm-account-dialog.ui:175 msgid "The verification code didn???t match, please try again." msgstr "Verifiseringskoden var ikke riktig. Vennligst pr??v igjen." -#: data/ui/osm-account-dialog.ui:209 +#: data/ui/osm-account-dialog.ui:201 msgid "Enter verification code shown above" msgstr "Oppgi verifikasjonskoden som vises over" -#: data/ui/osm-account-dialog.ui:232 +#: data/ui/osm-account-dialog.ui:224 msgid "Verify" msgstr "Verifiser" -#: data/ui/osm-account-dialog.ui:262 +#: data/ui/osm-account-dialog.ui:254 msgid "<span weight=\"bold\" size=\"x-large\">Signed In</span>" msgstr "<span weight=\"bold\" size=\"x-large\">Logget inn</span>" -#: data/ui/osm-account-dialog.ui:275 +#: data/ui/osm-account-dialog.ui:267 msgid "Your OpenStreetMap account is active." msgstr "Din OpenStreetMap-konto er aktiv." -#: data/ui/osm-account-dialog.ui:309 +#: data/ui/osm-account-dialog.ui:301 msgid "Sign Out" msgstr "Logg ut" @@ -600,7 +633,7 @@ msgid "Edit on OpenStreetMap" msgstr "Rediger p?? OpenStreetMap" -#: data/ui/osm-edit-dialog.ui:310 src/osmEditDialog.js:512 +#: data/ui/osm-edit-dialog.ui:310 src/osmEditDialog.js:513 msgid "Next" msgstr "Neste" @@ -668,8 +701,11 @@ "Rutetabeller for offentlig transport tilbys av tredjepartstjenester\n" "\n" "GNOME kan ikke garantere riktighet for rutetabellene og tidsplanene.\n" -"Merk at enkelte tilbydere ikke alltid inkluderer alle mulige typer transport. F.eks. vil noen akt??rer ikke ta med flyselskaper, mens en lokal tilbyder kanskje utelater regionstog.\n" -"Navn og merker som vises skal anses som registrerte varemerker n??r det er relevant." +"Merk at enkelte tilbydere ikke alltid inkluderer alle mulige typer " +"transport. F.eks. vil noen akt??rer ikke ta med flyselskaper, mens en lokal " +"tilbyder kanskje utelater regionstog.\n" +"Navn og merker som vises skal anses som registrerte varemerker n??r det er " +"relevant." #: data/ui/social-place-more-results-row.ui:8 msgid "Show more results" @@ -758,18 +794,26 @@ msgid "Could not find OSM element" msgstr "Fant ikke OSM-element" -#: src/application.js:94 +#: src/application.js:95 msgid "A path to a local tiles directory structure" msgstr "En sti til en lokal katalogstruktur med fliser" -#: src/application.js:98 +#: src/application.js:101 +msgid "Tile size for local tiles directory" +msgstr "St??rrelse p?? fliser i lokal katalogstruktur med fliser" + +#: src/application.js:105 msgid "Show the version of the program" msgstr "Vis programmets versjon" -#: src/application.js:104 +#: src/application.js:111 msgid "Ignore network availability" msgstr "Overse nettverkstilgjengelighet" +#: src/application.js:121 src/application.js:122 +msgid "[FILE???|URI]" +msgstr "[FIL???|URI]" + #: src/checkInDialog.js:167 msgid "Select an account" msgstr "Velg en konto" @@ -812,7 +856,7 @@ msgid "Write an optional message to check in to %s." msgstr "Skriv en valgfri melding for ?? sjekke inn ved %s." -#: src/checkInDialog.js:280 src/checkIn.js:162 src/osmEditDialog.js:549 +#: src/checkInDialog.js:280 src/checkIn.js:162 src/osmEditDialog.js:550 msgid "An error has occurred" msgstr "Det har oppst??tt en feil" @@ -887,15 +931,15 @@ msgid "unknown geometry" msgstr "ukjent geometri" -#: src/graphHopper.js:112 src/transitPlan.js:192 +#: src/graphHopper.js:112 src/transitPlan.js:201 msgid "Route request failed." msgstr "Foresp??rsel om rute feilet." -#: src/graphHopper.js:119 src/transitPlan.js:184 +#: src/graphHopper.js:119 src/transitPlan.js:193 msgid "No route found." msgstr "Ingen rute funnet." -#: src/graphHopper.js:207 src/transitplugins/openTripPlanner.js:1100 +#: src/graphHopper.js:207 src/transitplugins/openTripPlanner.js:1111 msgid "Start!" msgstr "Start!" @@ -903,25 +947,25 @@ msgid "All Layer Files" msgstr "Alle lagfiler" -#: src/mainWindow.js:451 +#: src/mainWindow.js:470 msgid "Failed to connect to location service" msgstr "Klarte ikke ?? koble til posisjonstjeneste" -#: src/mainWindow.js:548 +#: src/mainWindow.js:565 msgid "translator-credits" msgstr "" "haarek <haarektr...@gmail.com>, Kjartan Maraas <kmar...@gnome.org>, ??ka " "Sikrom <a4nospampleasethank...@hush.com>" -#: src/mainWindow.js:551 +#: src/mainWindow.js:568 msgid "A map application for GNOME" msgstr "Et kartprogram for GNOME" -#: src/mainWindow.js:562 +#: src/mainWindow.js:579 msgid "Copyright ?? 2011 ??? 2019 Red Hat, Inc. and The GNOME Maps authors" msgstr "Opphavsrett ?? 2011 - 2019 Red Hat, Inc. og GNOME kart utviklerene" -#: src/mainWindow.js:582 +#: src/mainWindow.js:599 #, javascript-format msgid "Map data by %s and contributors" msgstr "Kartdata av %s og bidragsytere" @@ -931,7 +975,7 @@ #. * the bare name of the tile provider, or a linkified URL if one #. * is available #. -#: src/mainWindow.js:598 +#: src/mainWindow.js:615 #, javascript-format msgid "Map tiles provided by %s" msgstr "Kartfliser av %s" @@ -945,20 +989,20 @@ #. * (i.e. "%2$s ... %1$s ..." for positioning the project URL #. * before the provider). #. -#: src/mainWindow.js:627 +#: src/mainWindow.js:644 #, javascript-format msgid "Search provided by %s using %s" msgstr "S??k tilbys av %s ved bruk av %s" -#: src/mapView.js:375 +#: src/mapView.js:466 msgid "File type is not supported" msgstr "Filtypen er ikke st??ttet" -#: src/mapView.js:382 +#: src/mapView.js:473 msgid "Failed to open layer" msgstr "Klarte ikke ?? ??pne lag" -#: src/mapView.js:418 +#: src/mapView.js:509 msgid "Failed to open GeoURI" msgstr "Klarte ikke ?? ??pne GeoURI" @@ -992,23 +1036,23 @@ msgid "Way or relation refers to non-existing children" msgstr "" -#: src/osmEditDialog.js:105 +#: src/osmEditDialog.js:106 msgid "Name" msgstr "Navn" -#: src/osmEditDialog.js:108 +#: src/osmEditDialog.js:109 msgid "The official name. This is typically what appears on signs." msgstr "Det offisielle navnet. Dette er typisk det som vises p?? skilt." -#: src/osmEditDialog.js:111 +#: src/osmEditDialog.js:112 msgid "Address" msgstr "Adresse" -#: src/osmEditDialog.js:119 +#: src/osmEditDialog.js:120 msgid "Website" msgstr "Nettsted" -#: src/osmEditDialog.js:122 +#: src/osmEditDialog.js:123 msgid "" "The official website. Try to use the most basic form of a URL i.e. http://" "example.com instead of http://example.com/index.html." @@ -1016,11 +1060,11 @@ "Det offisielle nettstedet. Pr??v ?? bruke den mest grunnleggende formen av en " "URL. F.eks. http://eksempel.no i stedet for http://eksempel.no/index.html." -#: src/osmEditDialog.js:127 +#: src/osmEditDialog.js:128 msgid "Phone" msgstr "Telefon" -#: src/osmEditDialog.js:131 +#: src/osmEditDialog.js:132 msgid "" "Phone number. Use the international format, starting with a + sign. Beware " "of local privacy laws, especially for private phone numbers." @@ -1029,196 +1073,196 @@ "V??r observant p?? lokale lover om personvern, spesielt for private " "telefonnummer." -#: src/osmEditDialog.js:136 src/placeBubble.js:191 +#: src/osmEditDialog.js:137 src/placeBubble.js:197 msgid "Wikipedia" msgstr "Wikipedia" -#: src/osmEditDialog.js:140 +#: src/osmEditDialog.js:141 msgid "" "The format used should include the language code and the article title like " "???en:Article title???." msgstr "" -#: src/osmEditDialog.js:144 +#: src/osmEditDialog.js:145 msgid "Opening hours" msgstr "??pningstider" -#: src/osmEditDialog.js:149 +#: src/osmEditDialog.js:150 msgid "See the link in the label for help on format." msgstr "Se lenken i etiketten for hjelp om format." -#: src/osmEditDialog.js:152 +#: src/osmEditDialog.js:153 msgid "Population" msgstr "Folketall" -#: src/osmEditDialog.js:157 +#: src/osmEditDialog.js:158 msgid "Altitude" msgstr "H??yde" -#: src/osmEditDialog.js:160 +#: src/osmEditDialog.js:161 msgid "Elevation (height above sea level) of a point in metres." msgstr "H??yde over have for et punkt i meter." -#: src/osmEditDialog.js:163 +#: src/osmEditDialog.js:164 msgid "Wheelchair access" msgstr "Rullestolvennlig" -#: src/osmEditDialog.js:166 src/osmEditDialog.js:175 src/osmEditDialog.js:213 +#: src/osmEditDialog.js:167 src/osmEditDialog.js:176 src/osmEditDialog.js:214 msgid "Yes" msgstr "Ja" -#: src/osmEditDialog.js:167 src/osmEditDialog.js:176 src/osmEditDialog.js:214 +#: src/osmEditDialog.js:168 src/osmEditDialog.js:177 src/osmEditDialog.js:215 msgid "No" msgstr "Nei" -#: src/osmEditDialog.js:168 +#: src/osmEditDialog.js:169 msgid "Limited" msgstr "Begrenset" -#: src/osmEditDialog.js:169 +#: src/osmEditDialog.js:170 msgid "Designated" msgstr "Spesialtilpasset" -#: src/osmEditDialog.js:172 +#: src/osmEditDialog.js:173 msgid "Internet access" msgstr "Internett-tilgang" #. Translators: #. * This means a WLAN Hotspot, also know as wireless, wifi or Wi-Fi. #. -#: src/osmEditDialog.js:177 src/translations.js:340 +#: src/osmEditDialog.js:178 src/translations.js:340 msgid "Wi-Fi" msgstr "Tr??dl??st" -#: src/osmEditDialog.js:178 +#: src/osmEditDialog.js:179 msgid "Wired" msgstr "Tr??dbundet" -#: src/osmEditDialog.js:179 +#: src/osmEditDialog.js:180 msgid "Terminal" msgstr "Terminal" -#: src/osmEditDialog.js:180 +#: src/osmEditDialog.js:181 msgid "Service" msgstr "Tjeneste" -#: src/osmEditDialog.js:183 +#: src/osmEditDialog.js:184 msgid "Religion" msgstr "Religion" -#: src/osmEditDialog.js:186 src/translations.js:363 +#: src/osmEditDialog.js:187 src/translations.js:363 msgid "Animism" msgstr "Animisme" -#: src/osmEditDialog.js:187 +#: src/osmEditDialog.js:188 msgid "Bah???????" msgstr "Bah???????" -#: src/osmEditDialog.js:188 src/translations.js:365 +#: src/osmEditDialog.js:189 src/translations.js:365 msgid "Buddhism" msgstr "Buddisme" -#: src/osmEditDialog.js:189 src/translations.js:366 +#: src/osmEditDialog.js:190 src/translations.js:366 msgid "Caodaism" msgstr "Caodaisme" -#: src/osmEditDialog.js:190 src/translations.js:367 +#: src/osmEditDialog.js:191 src/translations.js:367 msgid "Christianity" msgstr "Kristendom" -#: src/osmEditDialog.js:191 src/translations.js:368 +#: src/osmEditDialog.js:192 src/translations.js:368 msgid "Confucianism" msgstr "Konfusianisme" -#: src/osmEditDialog.js:192 src/translations.js:369 +#: src/osmEditDialog.js:193 src/translations.js:369 msgid "Hinduism" msgstr "Hinduisme" -#: src/osmEditDialog.js:193 src/translations.js:370 +#: src/osmEditDialog.js:194 src/translations.js:370 msgid "Jainism" msgstr "Jainisme" -#: src/osmEditDialog.js:194 src/translations.js:371 +#: src/osmEditDialog.js:195 src/translations.js:371 msgid "Judaism" msgstr "J??dedom" -#: src/osmEditDialog.js:195 src/translations.js:372 +#: src/osmEditDialog.js:196 src/translations.js:372 msgid "Islam" msgstr "Islam" -#: src/osmEditDialog.js:196 src/translations.js:373 +#: src/osmEditDialog.js:197 src/translations.js:373 msgid "Multiple Religions" msgstr "Flere religioner" -#: src/osmEditDialog.js:197 src/translations.js:374 +#: src/osmEditDialog.js:198 src/translations.js:374 msgid "Paganism" msgstr "Paganisme" -#: src/osmEditDialog.js:198 src/translations.js:375 +#: src/osmEditDialog.js:199 src/translations.js:375 msgid "Pastafarianism" msgstr "Pastafarianisme" -#: src/osmEditDialog.js:199 src/translations.js:376 +#: src/osmEditDialog.js:200 src/translations.js:376 msgid "Scientology" msgstr "Scientologi" -#: src/osmEditDialog.js:200 src/translations.js:377 +#: src/osmEditDialog.js:201 src/translations.js:377 msgid "Shinto" msgstr "Shinto" -#: src/osmEditDialog.js:201 src/translations.js:378 +#: src/osmEditDialog.js:202 src/translations.js:378 msgid "Sikhism" msgstr "Sikdom" -#: src/osmEditDialog.js:202 src/translations.js:379 +#: src/osmEditDialog.js:203 src/translations.js:379 msgid "Spiritualism" msgstr "Spiritualisme" -#: src/osmEditDialog.js:203 src/translations.js:380 +#: src/osmEditDialog.js:204 src/translations.js:380 msgid "Taoism" msgstr "Taoisme" -#: src/osmEditDialog.js:204 src/translations.js:381 +#: src/osmEditDialog.js:205 src/translations.js:381 msgid "Unitarian Universalism" msgstr "" -#: src/osmEditDialog.js:205 src/translations.js:382 +#: src/osmEditDialog.js:206 src/translations.js:382 msgid "Voodoo" msgstr "Voodo" -#: src/osmEditDialog.js:206 src/translations.js:383 +#: src/osmEditDialog.js:207 src/translations.js:383 msgid "Yazidism" msgstr "Jesidisme" -#: src/osmEditDialog.js:207 src/translations.js:384 +#: src/osmEditDialog.js:208 src/translations.js:384 msgid "Zoroastrianism" msgstr "Zoroastrisme" -#: src/osmEditDialog.js:210 +#: src/osmEditDialog.js:211 msgid "Toilets" msgstr "Toaletter" -#: src/osmEditDialog.js:217 +#: src/osmEditDialog.js:218 msgid "Note" msgstr "Merknad" -#: src/osmEditDialog.js:220 +#: src/osmEditDialog.js:221 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:325 +#: src/osmEditDialog.js:326 msgctxt "dialog title" msgid "Add to OpenStreetMap" msgstr "Legg til p?? OpenStreetMap" -#: src/osmEditDialog.js:379 +#: src/osmEditDialog.js:380 msgid "Select Type" msgstr "Velg type" -#: src/osmEditDialog.js:496 +#: src/osmEditDialog.js:497 msgid "Done" msgstr "Ferdig" @@ -1226,39 +1270,45 @@ msgid "Unnamed place" msgstr "Sted uten navn" -#: src/placeBubble.js:143 +#. TODO: this is a bit of a work-around to re-interpret the population, +#. * stored as a string into an integer to convert back to a locale- +#. * formatted string. Ideally it should be kept as an integer value +#. * in the Place class. But this will also need to be handled by the +#. * PlaceStore, possible in a backwards-compatible way +#. +#: src/placeBubble.js:149 msgid "Population:" msgstr "Folketall:" -#: src/placeBubble.js:149 +#: src/placeBubble.js:155 msgid "Altitude:" msgstr "H??yde:" -#: src/placeBubble.js:154 +#: src/placeBubble.js:160 msgid "Opening hours:" msgstr "??pningstider:" -#: src/placeBubble.js:159 +#: src/placeBubble.js:165 msgid "Internet access:" msgstr "Internettaksess:" -#: src/placeBubble.js:164 +#: src/placeBubble.js:170 msgid "Religion:" msgstr "Religion:" -#: src/placeBubble.js:169 +#: src/placeBubble.js:175 msgid "Toilets:" msgstr "Toaletter:" -#: src/placeBubble.js:174 +#: src/placeBubble.js:180 msgid "Wheelchair access:" msgstr "Rullestolvennlig:" -#: src/placeBubble.js:180 src/placeBubble.js:184 +#: src/placeBubble.js:186 src/placeBubble.js:190 msgid "Phone:" msgstr "Telefon:" -#: src/placeEntry.js:209 +#: src/placeEntry.js:212 msgid "Failed to parse Geo URI" msgstr "Klarte ikke ?? tolke Geo-URI" @@ -1371,12 +1421,12 @@ msgstr "klarte ikke ?? laste fil" #. Translators: %s is a time expression with the format "%f h" or "%f min" -#: src/sidebar.js:296 +#: src/sidebar.js:358 #, javascript-format msgid "Estimated time: %s" msgstr "Estimert tid: %s" -#: src/sidebar.js:352 +#: src/sidebar.js:414 #, javascript-format msgid "Itineraries provided by %s" msgstr "Ruteplaner tilbys av %s" @@ -1413,7 +1463,7 @@ msgid "Arrive at %s" msgstr "Ankom ved %s" -#: src/transit.js:77 src/transitplugins/openTripPlanner.js:1113 +#: src/transit.js:77 src/transitplugins/openTripPlanner.js:1124 msgid "Arrive" msgstr "Ankom" @@ -1445,16 +1495,16 @@ #. * Translators: this is a format string giving the equivalent to #. * "may 29" according to the current locale's convensions. #. -#: src/transitOptionsPanel.js:143 +#: src/transitOptionsPanel.js:140 msgctxt "month-day-date" msgid "%b %e" msgstr "%b %e" -#: src/transitPlan.js:188 +#: src/transitPlan.js:197 msgid "No timetable data found for this route." msgstr "Ingen ruteinformasjon funnet for denne ruten." -#: src/transitPlan.js:196 +#: src/transitPlan.js:205 msgid "No provider found for this route." msgstr "Ingen tilbyder funnet for denne ruten." @@ -1463,7 +1513,7 @@ #. * "12:00 ??? 13:03" where the placeholder %s are the actual times, #. * these could be rearranged if needed. #. -#: src/transitPlan.js:313 +#: src/transitPlan.js:322 #, javascript-format msgid "%s ??? %s" msgstr "%s ??? %s" @@ -1472,34 +1522,34 @@ #. * less than an hour, with only the minutes part, using plural forms #. * as appropriate #. -#: src/transitPlan.js:340 +#: src/transitPlan.js:351 #, javascript-format -msgid "%d minute" -msgid_plural "%d minutes" -msgstr[0] "%d minutt" -msgstr[1] "%d minutter" +msgid "%s minute" +msgid_plural "%s minutes" +msgstr[0] "%s minutt" +msgstr[1] "%s minutter" #. translators: this is an indication for a trip duration, #. * where the duration is an exact number of hours (i.e. no #. * minutes part), using plural forms as appropriate #. -#: src/transitPlan.js:351 +#: src/transitPlan.js:363 #, javascript-format -msgid "%d hour" -msgid_plural "%d hours" -msgstr[0] "%d time" -msgstr[1] "%d timer" +msgid "%s hour" +msgid_plural "%s hours" +msgstr[0] "%s time" +msgstr[1] "%s timer" #. translators: this is an indication for a trip duration #. * where the duration contains an hour and minute part, it's #. * pluralized on the hours part #. -#: src/transitPlan.js:357 +#: src/transitPlan.js:371 #, javascript-format -msgid "%d:%02d hour" -msgid_plural "%d:%02d hours" -msgstr[0] "%d:%02d time" -msgstr[1] "%d:%02d timer" +msgid "%s:%s hour" +msgid_plural "%s:%s hours" +msgstr[0] "%s:%s time" +msgstr[1] "%s:%s timer" #. Translators: this is a format string for showing a departure and #. * arrival time in a more compact manner to show in the instruction @@ -1507,7 +1557,7 @@ #. * "12:00???13:03" where the placeholder %s are the actual times, #. * these could be rearranged if needed. #. -#: src/transitPlan.js:750 +#: src/transitPlan.js:764 #, javascript-format msgid "%s???%s" msgstr "%s???%s" @@ -1667,154 +1717,184 @@ msgstr "N??yaktighet: %s" #. Translators: Accuracy of user location information -#: src/utils.js:229 +#: src/utils.js:248 msgid "Unknown" msgstr "Ukjent" #. Translators: Accuracy of user location information -#: src/utils.js:232 +#: src/utils.js:251 msgid "Exact" msgstr "N??yaktig" -#: src/utils.js:290 +#. Translators: this is a duration with only hours, using +#. * an abbreviation for hours, corresponding to 'h' in English +#. +#: src/utils.js:332 +#, javascript-format +msgid "%s h" +msgstr "%s t" + +#. Translators: this is a duration with hours and minutes parts +#. * using abbreviations for hours and minutes, correspoding to 'h' +#. * and 'min' in English. The minutes has appropriate plural variations +#. +#: src/utils.js:338 #, javascript-format -msgid "%f h" -msgstr "%f t" +msgid "%s h %s min" +msgid_plural "%s h %s min" +msgstr[0] "%s t %s min" +msgstr[1] "%s t %s min" -#: src/utils.js:292 +#. Translators: this is a duration with minutes part +#. * using abbreviation for minutes, corresponding to 'min' in English +#. * with appropriate plural variations +#. +#: src/utils.js:345 #, javascript-format -msgid "%f min" -msgstr "%f min" +msgid "%s min" +msgid_plural "%s min" +msgstr[0] "%s min" +msgstr[1] "%s min" -#: src/utils.js:294 +#. Translators: this is a duration of less than one minute +#. * with seconds using an abbreviation for seconds, corresponding to +#. * 's' in English with appropriate plural forms +#. +#: src/utils.js:351 #, javascript-format -msgid "%f s" -msgstr "%f s" +msgid "%s s" +msgid_plural "%s s" +msgstr[0] "%s s" +msgstr[1] "%s s" #. Translators: This is a distance measured in kilometers -#: src/utils.js:305 +#: src/utils.js:362 #, javascript-format msgid "%s km" msgstr "%s km" #. Translators: This is a distance measured in meters -#: src/utils.js:308 +#: src/utils.js:365 #, javascript-format msgid "%s m" msgstr "%s m" #. Translators: This is a distance measured in miles -#: src/utils.js:316 +#: src/utils.js:373 #, javascript-format msgid "%s mi" msgstr "%s mi" #. Translators: This is a distance measured in feet -#: src/utils.js:319 +#: src/utils.js:376 #, javascript-format msgid "%s ft" msgstr "%s ft" -#: src/transitplugins/openTripPlanner.js:1174 +#: src/transitplugins/goMetro.js:60 +msgid "This plugin doesn't support latest arrival" +msgstr "Dette tillegget st??tter ikke siste ankomst" + +#: src/transitplugins/openTripPlanner.js:1185 #, javascript-format msgid "Continue on %s" msgstr "Fortsett p?? %s" -#: src/transitplugins/openTripPlanner.js:1176 +#: src/transitplugins/openTripPlanner.js:1187 msgid "Continue" msgstr "Fortsett" -#: src/transitplugins/openTripPlanner.js:1179 +#: src/transitplugins/openTripPlanner.js:1190 #, javascript-format msgid "Turn left on %s" msgstr "Sving til venstre p?? %s" -#: src/transitplugins/openTripPlanner.js:1181 +#: src/transitplugins/openTripPlanner.js:1192 msgid "Turn left" msgstr "Sving til venstre" -#: src/transitplugins/openTripPlanner.js:1184 +#: src/transitplugins/openTripPlanner.js:1195 #, javascript-format msgid "Turn slightly left on %s" msgstr "Sving svakt til venstre p?? %s" -#: src/transitplugins/openTripPlanner.js:1186 +#: src/transitplugins/openTripPlanner.js:1197 msgid "Turn slightly left" msgstr "Sving svakt til venstre" -#: src/transitplugins/openTripPlanner.js:1189 +#: src/transitplugins/openTripPlanner.js:1200 #, javascript-format msgid "Turn sharp left on %s" msgstr "Sving hardt til venstre p?? %s" -#: src/transitplugins/openTripPlanner.js:1191 +#: src/transitplugins/openTripPlanner.js:1202 msgid "Turn sharp left" msgstr "Sving hardt til venstre" -#: src/transitplugins/openTripPlanner.js:1194 +#: src/transitplugins/openTripPlanner.js:1205 #, javascript-format msgid "Turn right on %s" msgstr "Sving til h??yre p?? %s" -#: src/transitplugins/openTripPlanner.js:1196 +#: src/transitplugins/openTripPlanner.js:1207 msgid "Turn right" msgstr "Sving til h??yre" -#: src/transitplugins/openTripPlanner.js:1199 +#: src/transitplugins/openTripPlanner.js:1210 #, javascript-format msgid "Turn slightly right on %s" msgstr "Sving svakt til h??yre p?? %s" -#: src/transitplugins/openTripPlanner.js:1201 +#: src/transitplugins/openTripPlanner.js:1212 msgid "Turn slightly right" msgstr "Sving svakt til h??yre" -#: src/transitplugins/openTripPlanner.js:1204 +#: src/transitplugins/openTripPlanner.js:1215 #, javascript-format msgid "Turn sharp right on %s" msgstr "Sving hardt til h??yre p?? %s" -#: src/transitplugins/openTripPlanner.js:1206 +#: src/transitplugins/openTripPlanner.js:1217 msgid "Turn sharp right" msgstr "Sving hardt til h??yre" -#: src/transitplugins/openTripPlanner.js:1212 +#: src/transitplugins/openTripPlanner.js:1223 #, javascript-format msgid "In the roundabout, take exit %s" msgstr "Ta avkj??rsel %s i rundkj??ringen" -#: src/transitplugins/openTripPlanner.js:1214 +#: src/transitplugins/openTripPlanner.js:1225 #, javascript-format msgid "In the roundabout, take exit to %s" msgstr "Ta avkj??rsel til %s i rundkj??ringen" -#: src/transitplugins/openTripPlanner.js:1216 +#: src/transitplugins/openTripPlanner.js:1227 msgid "Take the roundabout" msgstr "Kj??r gjennom rundkj??ringen" -#: src/transitplugins/openTripPlanner.js:1220 +#: src/transitplugins/openTripPlanner.js:1231 #, javascript-format msgid "Take the elevator and get off at %s" msgstr "Ta heisen og g?? av i %s" -#: src/transitplugins/openTripPlanner.js:1222 +#: src/transitplugins/openTripPlanner.js:1233 msgid "Take the elevator" msgstr "Ta heisen" -#: src/transitplugins/openTripPlanner.js:1226 +#: src/transitplugins/openTripPlanner.js:1237 #, javascript-format msgid "Make a left u-turn onto %s" -msgstr "" +msgstr "Ta en u-sving til venstre inn p?? %s" -#: src/transitplugins/openTripPlanner.js:1228 +#: src/transitplugins/openTripPlanner.js:1239 msgid "Make a left u-turn" -msgstr "" +msgstr "Ta en u-sving til venstre" -#: src/transitplugins/openTripPlanner.js:1231 +#: src/transitplugins/openTripPlanner.js:1242 #, javascript-format msgid "Make a right u-turn onto %s" -msgstr "" +msgstr "Ta en u-sving til h??yre inn p?? %s" -#: src/transitplugins/openTripPlanner.js:1233 +#: src/transitplugins/openTripPlanner.js:1244 msgid "Make a right u-turn" -msgstr "" +msgstr "Ta en u-sving til h??yre" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-maps-3.38.2/src/placeBubble.js new/gnome-maps-3.38.3/src/placeBubble.js --- old/gnome-maps-3.38.2/src/placeBubble.js 2020-11-21 14:24:38.810237600 +0100 +++ new/gnome-maps-3.38.3/src/placeBubble.js 2021-01-09 14:47:09.005070400 +0100 @@ -98,8 +98,8 @@ if (Application.placeStore.isStale(this.place)) { overpass.addInfo(this.place); } else { - let place = Application.placeStore.get(this.place); - this._populate(place); + this._place = Application.placeStore.get(this.place); + this._populate(this.place); } } else if (this.place.store && !this.place.prefilled) { overpass.addInfo(this.place);