Index: applications/editors/josm/i18n/po/nb.po =================================================================== --- applications/editors/josm/i18n/po/nb.po (revision 22209) +++ applications/editors/josm/i18n/po/nb.po (revision 22278) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-06 17:43+0200\n" -"PO-Revision-Date: 2010-06-28 16:31+0000\n" +"POT-Creation-Date: 2010-07-11 21:01+0200\n" +"PO-Revision-Date: 2010-07-06 17:43+0000\n" "Last-Translator: Stian Ellingsen \n" "Language-Team: Norwegian Bokmal \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-07-06 15:12+0000\n" +"X-Launchpad-Export-Date: 2010-07-11 18:56+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -263,5 +263,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129 @@ -654,9 +654,9 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507 @@ -1467,5 +1467,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351 @@ -2722,6 +2722,6 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 @@ -2752,7 +2752,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 -#, fuzzy msgid "Invalid search expression" -msgstr "regulært uttrykk" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408 @@ -4283,5 +4282,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 @@ -4830,5 +4829,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122 #: build/specialmessages.java:64 msgid "Up" @@ -4840,5 +4839,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 msgid "Down" msgstr "Ned" @@ -5425,5 +5424,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156 @@ -5522,9 +5521,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 msgid "Filter objects and hide/disable them." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 @@ -5537,53 +5536,52 @@ msgstr "Legg til" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87 msgid "Add filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 msgid "Edit filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112 msgid "Delete filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122 msgid "Move filter up." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 msgid "Move filter down." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:147 msgid "Enable filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:148 msgid "Hide elements" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:150 msgid "Inverse filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:151 msgid "Filter mode" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218 #, java-format msgid "Filter Hidden:{0} Disabled:{1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:57 msgid "Error in filter" -msgstr "Feil ved lasting av fil" +msgstr "" #. translators notes must be in front #. column header: enable filter -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255 msgctxt "filter" msgid "E" @@ -5591,5 +5589,5 @@ #. column header: hide filter -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256 msgctxt "filter" msgid "H" @@ -5597,5 +5595,5 @@ #. column header: filter text -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257 msgctxt "filter" msgid "Text" @@ -5603,5 +5601,5 @@ #. column header: inverted filter -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258 msgctxt "filter" msgid "I" @@ -5609,5 +5607,5 @@ #. column header: filter mode -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259 msgctxt "filter" msgid "M" @@ -5616,5 +5614,5 @@ #. translators notes must be in front #. filter mode: replace -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328 msgctxt "filter" msgid "R" @@ -5622,5 +5620,5 @@ #. filter mode: add -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330 msgctxt "filter" msgid "A" @@ -5628,5 +5626,5 @@ #. filter mode: remove -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332 msgctxt "filter" msgid "D" @@ -5634,24 +5632,24 @@ #. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334 msgctxt "filter" msgid "F" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364 msgid "

Filter active

" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370 #, java-format msgid "

{0} objects hidden" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378 #, java-format msgid "{0} objects disabled" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381 msgid "

Close the filter dialog to see all objects.

" msgstr "" @@ -10221,10 +10219,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 msgid "Delete image file from disk" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658 #, java-format msgid "" @@ -10233,5 +10231,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683 msgid "Image file could not be deleted." msgstr "" @@ -12799,5 +12797,5 @@ msgstr "Velg en lisens" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:52 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87 @@ -12808,5 +12806,5 @@ msgstr "Markører fra {0}" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:68 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:214 #, java-format @@ -12816,5 +12814,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220 @@ -12824,5 +12822,5 @@ #. input was not properly parsed, abort -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:82 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:72 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:128 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:225 @@ -13488,9 +13486,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:576 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577 msgid "Preparing data set..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593 #, java-format msgid "Line {0} column {1}: " @@ -14287,11 +14285,11 @@ msgstr "Fant ikke oversettelsen for {0}. Bruker {1}." -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:151 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:162 #, java-format msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:203 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:217 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:214 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:228 #, java-format msgid "" @@ -14300,5 +14298,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:237 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:248 #, java-format msgid "" @@ -14984,7 +14982,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83 -#, fuzzy msgid "on polygon" -msgstr "Multipolygon" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95 @@ -15003,15 +15000,14 @@ msgstr "Bygninger" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418 msgid "Next no" -msgstr "Neste" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404 +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460 msgid "Enter addresses" msgstr "" @@ -15180,5 +15176,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 -msgid "Don't use relation for addresses (but \"addr:street\" on nodes)." +msgid "Don't use relation for addresses (but \"addr:street\" on elements)." msgstr "" @@ -25895,7 +25891,6 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -#, fuzzy msgid "american_football" -msgstr "australsk fotball" +msgstr "" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -25926,7 +25921,6 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -#, fuzzy msgid "canadian_football" -msgstr "australsk fotball" +msgstr "" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -25972,7 +25966,6 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -#, fuzzy msgid "gaelic_football" -msgstr "australsk fotball" +msgstr "" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -26018,7 +26011,6 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -#, fuzzy msgid "rugby_union" -msgstr "rugby" +msgstr "" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -26508,35 +26500,29 @@ #: build/trans_presets.java:2076 -#, fuzzy msgid "American Football" -msgstr "Australsk fotball" +msgstr "" #. item "Sport (Ball)/American Football" #: build/trans_presets.java:2077 -#, fuzzy msgid "Edit American Football" -msgstr "Rediger australsk fotball" +msgstr "" #: build/trans_presets.java:2082 -#, fuzzy msgid "Canadian Football" -msgstr "Rediger amerikansk fotball" +msgstr "" #. item "Sport (Ball)/Canadian Football" #: build/trans_presets.java:2083 -#, fuzzy msgid "Edit Canadian Football" -msgstr "Rediger australsk fotball" +msgstr "" #: build/trans_presets.java:2088 -#, fuzzy msgid "Gaelic Football" -msgstr "Rediger amerikansk fotball" +msgstr "" #. item "Sport (Ball)/Gaelic Football" #: build/trans_presets.java:2089 -#, fuzzy msgid "Edit Gaelic Football" -msgstr "Rediger amerikansk fotball" +msgstr "" #: build/trans_presets.java:2094 @@ -26546,18 +26532,15 @@ #. item "Sport (Ball)/Rugby League" #: build/trans_presets.java:2095 -#, fuzzy msgid "Edit Rugby League" -msgstr "Rediger rugby" +msgstr "" #: build/trans_presets.java:2100 -#, fuzzy msgid "Rugby Union" -msgstr "Rugby" +msgstr "" #. item "Sport (Ball)/Rugby Union" #: build/trans_presets.java:2101 -#, fuzzy msgid "Edit Rugby Union" -msgstr "Rediger rugby" +msgstr "" #: build/trans_presets.java:2106 @@ -33302,75 +33285,4 @@ msgid "Sicily - Italy" msgstr "Sicilia, Italia" - -#~ msgid "" -#~ "An error occurred while communicating with the server
Details: " -#~ "{0}" -#~ msgstr "" -#~ "Det oppstod en feil under kommunikasjon med tjeneren.
Detaljer: " -#~ "{0}" - -#~ msgid "Communication with server failed" -#~ msgstr "Kommunikasjon med tjener feilet" - -#~ msgid "Yes, undelete them too" -#~ msgstr "Ja, gjenopprett også dem" - -#~ msgid "No, cancel operation" -#~ msgstr "Nei, avbryt operasjonen" - -#~ msgid "Undelete additional nodes?" -#~ msgstr "Gjenopprette ytterligere noder?" - -#~ msgid "Undelete dependent primitives?" -#~ msgstr "Gjenopprette avhengige objekter?" - -#~ msgid "Visible State:" -#~ msgstr "Synlighetsstatus:" - -#~ msgid "visible (on the server)" -#~ msgstr "synlig (på tjeneren)" - -#~ msgid "not visible (on the server)" -#~ msgstr "ikke synlig (på tjeneren)" - -#~ msgid "Keep a clone of the local version" -#~ msgstr "Behold en klone av den lokale versjonen" - -#~ msgid "Physically delete from local dataset" -#~ msgstr "Slett fra det lokale datasettet" - -#~ msgid "Keep my visible state" -#~ msgstr "Behold lokal synlighetsstatus" - -#~ msgid "Yes, reset the id" -#~ msgstr "Ja, nullstill ID" - -#~ msgid "Reset id to 0" -#~ msgstr "Nullstill ID" - -#~ msgid "Keep their visible state" -#~ msgstr "Behold tjenerens synlighetsstatus" - -#~ msgid "Yes, purge it" -#~ msgstr "Ja, rydd ut objektet" - -#~ msgid "" -#~ "JOSM will have to remove your local primitive with id {0}
from " -#~ "the dataset.
Do you agree?" -#~ msgstr "" -#~ "JOSM må fjerne lokalt element med ID {0} fra datasettet.
Er " -#~ "dette OK?" - -#~ msgid "Remove from dataset" -#~ msgstr "Fjern fra datasett" - -#~ msgid "Undecide conflict between visible state" -#~ msgstr "Fjern avgjørelse fra visningskonflikt" - -#~ msgid "football" -#~ msgstr "football" - -#~ msgid "Football" -#~ msgstr "Amerikansk fotball" #~ msgid "Move" @@ -34096,4 +34008,7 @@ #~ msgstr "sykkelkart" +#~ msgid "football" +#~ msgstr "football" + #~ msgid "Image with path {0} does not exist or is not readable." #~ msgstr "Bilde fra {0} finnes ikke eller er ikke lesbart." @@ -34327,4 +34242,40 @@ #~ msgstr "Fant ikke noe objekt med ID {0} og versjon {1} i dette datasettet" +#~ msgid "No, cancel operation" +#~ msgstr "Nei, avbryt operasjonen" + +#~ msgid "Yes, undelete them too" +#~ msgstr "Ja, gjenopprett også dem" + +#~ msgid "Undelete additional nodes?" +#~ msgstr "Gjenopprette ytterligere noder?" + +#~ msgid "Undelete dependent primitives?" +#~ msgstr "Gjenopprette avhengige objekter?" + +#~ msgid "not visible (on the server)" +#~ msgstr "ikke synlig (på tjeneren)" + +#~ msgid "visible (on the server)" +#~ msgstr "synlig (på tjeneren)" + +#~ msgid "Visible State:" +#~ msgstr "Synlighetsstatus:" + +#~ msgid "Keep their visible state" +#~ msgstr "Behold tjenerens synlighetsstatus" + +#~ msgid "Yes, purge it" +#~ msgstr "Ja, rydd ut objektet" + +#~ msgid "Keep my visible state" +#~ msgstr "Behold lokal synlighetsstatus" + +#~ msgid "Yes, reset the id" +#~ msgstr "Ja, nullstill ID" + +#~ msgid "Remove from dataset" +#~ msgstr "Fjern fra datasett" + #~ msgid "Login name (e-mail) to the OSM account." #~ msgstr "E-postadresse for OSM-kontoen" @@ -34427,4 +34378,7 @@ #~ msgid "Board Type" #~ msgstr "Tavletype" + +#~ msgid "Football" +#~ msgstr "Amerikansk fotball" #~ msgid "YAHOO (WebKit)" @@ -34524,4 +34478,17 @@ #~ msgstr "parameter «{0}» må ha en verdi" +#~ msgid "Communication with server failed" +#~ msgstr "Kommunikasjon med tjener feilet" + +#~ msgid "Reset id to 0" +#~ msgstr "Nullstill ID" + +#~ msgid "" +#~ "JOSM will have to remove your local primitive with id {0}
from " +#~ "the dataset.
Do you agree?" +#~ msgstr "" +#~ "JOSM må fjerne lokalt element med ID {0} fra datasettet.
Er " +#~ "dette OK?" + #~ msgid "Apply partial resolutions" #~ msgstr "Bruk ufullstendige løsninger" @@ -34533,6 +34500,22 @@ #~ msgstr "Velg en startnode i enden av en linje" +#~ msgid "Undecide conflict between visible state" +#~ msgstr "Fjern avgjørelse fra visningskonflikt" + +#~ msgid "" +#~ "An error occurred while communicating with the server
Details: " +#~ "{0}" +#~ msgstr "" +#~ "Det oppstod en feil under kommunikasjon med tjeneren.
Detaljer: " +#~ "{0}" + +#~ msgid "Keep a clone of the local version" +#~ msgstr "Behold en klone av den lokale versjonen" + #~ msgid ">" #~ msgstr ">" + +#~ msgid "Physically delete from local dataset" +#~ msgstr "Slett fra det lokale datasettet" #~ msgid "Reached the end of the line"