Index: applications/editors/josm/i18n/po/nb.po =================================================================== --- applications/editors/josm/i18n/po/nb.po (revision 17822) +++ applications/editors/josm/i18n/po/nb.po (revision 17946) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-28 16:38+0200\n" +"POT-Creation-Date: 2009-10-02 22:03+0200\n" "PO-Revision-Date: 2009-09-22 15:16+0000\n" "Last-Translator: Dirk Stöcker \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-09-28 14:34+0000\n" +"X-Launchpad-Export-Date: 2009-10-02 19:26+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -47,5 +47,5 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -90,9 +90,9 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:593 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:606 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:915 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 @@ -125,6 +125,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130 @@ -147,5 +147,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:260 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 @@ -329,5 +329,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53 @@ -339,12 +339,12 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 @@ -366,5 +366,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 @@ -453,9 +453,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 @@ -490,6 +490,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 @@ -619,22 +619,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 msgid "Combine Way" msgstr "Sammenføy linjer" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 msgid "Combine several ways into one." msgstr "Sammenføy flere linjer til én" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Change directions?" msgstr "Endre retninger?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 msgid "Reverse and Combine" msgstr "Snu og sammenføy" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -644,5 +644,5 @@ "retningen på noen av linjene?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -650,10 +650,10 @@ msgstr "Kan ikke sammenføye linjer. (Kan ikke bli sammenhengende nodestreng)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "Sammenføy {0} linjer" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "Velg minst to linjer å sammenføye." @@ -700,5 +700,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:858 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 @@ -766,5 +766,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333 msgid "OK" @@ -849,8 +849,8 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:156 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:236 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 @@ -886,5 +886,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:268 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 @@ -956,5 +956,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -1044,22 +1044,22 @@ msgstr "Flett det gjeldende laget inn i et annet lag" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 msgid "Merge Nodes" msgstr "Samle noder" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 msgid "Merge nodes into the oldest one." msgstr "Samle noder i den eldste" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 msgid "Please select at least two nodes to merge." msgstr "Velg minst to noder til å samle" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "Kan ikke samle noder. Ville ha måttet slette en linje som er i bruk." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261 #, java-format msgid "Merge {0} nodes" @@ -1236,5 +1236,5 @@ msgstr "Bruk egenskaper i utklippstavla på alle valgte element." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:106 #, java-format msgid "Pasting {0} tag" @@ -1243,5 +1243,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107 #, java-format msgid "to {0} primitive" @@ -1877,7 +1877,6 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118 -#, fuzzy msgid "No data found in this area." -msgstr "Fant ikke data på enhet." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 @@ -2148,53 +2147,53 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a filter string." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a search string." msgstr "Skriv inn søketekst." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 msgid "replace selection" msgstr "erstatt utvalg" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 msgid "add to selection" msgstr "legg til i utvalg" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:75 msgid "remove from selection" msgstr "fjern fra utvalg" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:76 msgid "find in selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 msgid "case sensitive" msgstr "skill mellom store/små bokstaver" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 msgid "regular expression" msgstr "regulært uttrykk" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 msgid "Baker Street - 'Baker' and 'Street' in any key or name." msgstr "Nansens gate – «Nansens» og «gate» i nøkkel eller navn." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "\"Nansens gate\" – «Nansens gate» i nøkkel eller navn." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Nan – «Nan» finnes innen navnet." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 msgid "type=route - key 'type' with value exactly 'route'." msgstr "type=route – nøkkel «type» med eksakt verdi «route»." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2204,50 +2203,50 @@ "*=value, type=, *=*, *=." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 msgid "-name:Bak - not 'Bak' in the name." msgstr "-name:Nan – «Nan» finnes ikke innen navnet." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 msgid "foot: - key=foot set to any value." msgstr "foot: – nøkkel «foot» med hvilken som helst verdi." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 msgid "Special targets:" msgstr "Spesialsøk:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 msgid "" "type: - type of the object (node, way, relation)" msgstr "type: – type objekt (node, way, relation)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 msgid "user:... - all objects changed by user" msgstr "user:… – alle objekter redigert av angitt bruker" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 msgid "id:... - object with given ID (0 for new objects)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 msgid "nodes:... - object with given number of nodes" msgstr "nodes:… – objekt med angitt antall noder" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 msgid "modified - all changed objects" msgstr "modified – alle endrede objekter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "selected - all selected objects" msgstr "selected – alle objekter i utvalg" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "incomplete - all incomplete objects" msgstr "incomplete – alle uferdige objekter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 msgid "untagged - all untagged objects" msgstr "untagged – alle objekter uten egenskaper" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 msgid "" "child expr - all children of objects matching the expression" @@ -2255,5 +2254,5 @@ "child uttrykk – alle underobjekter av objektene i uttrykket" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "" "parent expr - all parents of objects matching the expression" @@ -2261,9 +2260,9 @@ "parent uttrykk – alle overobjekter av objektene i uttrykket" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 msgid "Use | or OR to combine with logical or" msgstr "Bruk | eller OR for søk med logisk eller" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" @@ -2271,9 +2270,9 @@ "«:»)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "Use ( and ) to group expressions" msgstr "Bruk ( og ) for å gruppere uttrykk" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2283,51 +2282,51 @@ msgstr "Filter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147 msgid "Search" msgstr "Søk" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Start Search" msgstr "Start søk" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 #, java-format msgid "No match found for ''{0}''" msgstr "Fant ingen treff for «{0}»" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Ingenting lagt til utvalg ved søk etter «{0}»" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Ingenting fjernet fra utvalg ved søk etter «{0}»" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, java-format -msgid "Nothing find in selection by searching for ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254 +#, fuzzy, java-format +msgid "Nothing found in selection by searching for ''{0}''" +msgstr "Ingenting lagt til utvalg ved søk etter «{0}»" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264 #, java-format msgid "Found {0} matches" msgstr "Fant {0} treff" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 msgid "RX" msgstr "RX" @@ -2597,10 +2596,8 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:215 -#, fuzzy, java-format +#, java-format msgid "" "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" -"Kan ikke gjøre om kommando \"{0}\" fordi lag \"{1}\" ikke lenger er " -"tilgjengelig" #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 @@ -2648,5 +2645,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 msgid "Delete from relation" msgstr "Slett fra relasjon" @@ -2700,12 +2697,12 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107 -#, fuzzy, java-format +#, java-format msgid "Purged object ''{0}''" -msgstr "Flytt objektene {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117 -#, fuzzy, java-format +#, java-format msgid "Purged {0} objects" -msgstr "Endre {0} objekt" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 @@ -2719,7 +2716,7 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169 -#, fuzzy, java-format +#, java-format msgid "Removing reference from relation {0}" -msgstr "fjerner henvisning fra relasjon {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 @@ -3084,14 +3081,14 @@ msgstr "Advarsel: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:163 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:308 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:307 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:348 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:347 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 #, java-format @@ -3099,5 +3096,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:349 #, java-format msgid "Version > 0 expected. Got {0}." @@ -3453,7 +3450,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340 #, java-format @@ -3495,7 +3490,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 -#, fuzzy msgid "Not Found" -msgstr "Ikke Tilkoblet" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:155 @@ -3809,9 +3803,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:289 msgid "(no object)" msgstr "(intet objekt)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:416 msgid "User:" msgstr "" @@ -4310,5 +4304,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "slettet" @@ -4411,5 +4405,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4456,6 +4450,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 @@ -4469,6 +4463,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:196 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -4526,34 +4520,34 @@ msgstr "Tjenerens datasett inneholder ingen egenskap med nøkkel {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115 msgid "Conflicts when combining primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121 #, java-format msgid "Conflicts when combining ways - combined way is ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128 #, java-format msgid "Conflicts when merging nodes - merged node is ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257 msgid "No conflicts to resolve" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:339 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 @@ -4571,23 +4565,23 @@ msgstr "alle" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:66 msgid "Choose a value" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:54 -msgid "Please decided which values to keep" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:59 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:68 +msgid "Please decide which values to keep" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:73 #, java-format msgid "Value ''{0}'' is going to be applied for key ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:79 #, java-format msgid "The key ''{0}'' and all its values are going to be removed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:84 #, java-format msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''" @@ -4631,7 +4625,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "Paste ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "From ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "To ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:444 +#, java-format +msgid "{0} tag" +msgid_plural "{0} tags" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 #, java-format @@ -4641,7 +4655,5 @@ msgstr[1] "{0} linjer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format @@ -4651,26 +4663,4 @@ msgstr[1] "{0} relasjoner" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "Paste ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "From ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "To ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425 -#, java-format -msgid "{0} tag" -msgid_plural "{0} tags" -msgstr[0] "" -msgstr[1] "" - #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24 #, java-format @@ -4737,4 +4727,13 @@ msgid "Decision" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:42 +msgid "Please select the values to keep for the following tags." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:47 +#, fuzzy +msgid "Show tags with conflicts only" +msgstr "Noder (med konflikter)" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4753,5 +4752,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 @@ -4844,5 +4843,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 @@ -4998,6 +4997,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323 #, java-format msgid "This will change up to {0} object." @@ -5006,22 +5005,22 @@ msgstr[1] "Dette vil endre opptil {0} objekt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149 msgid "An empty value deletes the key." msgstr "Nøkkelen blir ikke lagret når den er tom." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347 msgid "Change values?" msgstr "Endre verdier?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264 #, java-format msgid "Change properties of up to {0} object" @@ -5030,69 +5029,69 @@ msgstr[1] "Endre egenskap på inntil {0} objekt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 msgid "Please select a key" msgstr "Velg en nøkkel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335 msgid "Please select a value" msgstr "Velg en verdi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447 msgid "Please select the objects you want to change properties for." msgstr "Velg de objekter, du vil rette egenskaper for." +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 msgid "Properties/Memberships" msgstr "Egenskaper/medlemsskaper" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 msgid "Properties for selected objects." msgstr "Egenskaper for valgte objekt." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 msgid "Member Of" msgstr "Medlem av" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:575 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576 msgid "Add Properties" msgstr "Tilføy egenskaper" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579 msgid "Add a new key/value pair to all objects" msgstr "Tilføy et nytt nøkkel/verdi-sett til alle objekter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:581 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Edit Properties" msgstr "Endre Oppsett" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 msgid "Edit the value of the selected key for all objects" msgstr "Rett verdien for den valgte nøkkel for alle objekter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:795 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:796 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Egenskaper: {0} / Medlemskap: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:798 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799 msgid "Properties / Memberships" msgstr "Egenskaper / Medlemskap" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 msgid "Change relation" msgstr "Skift relasjon" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:841 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Vil du slette utvalget fra relasjon {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860 msgid "Delete the selected key in all objects" msgstr "Fjern den valgte nøkkel i alle objekt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862 msgid "Delete Properties" msgstr "DSlett egenskaper" @@ -5134,7 +5133,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440 -#, fuzzy msgid "Set the current selection to the list of selected relations" -msgstr "Kan ikke splitte med dette utvalget" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 @@ -5175,14 +5173,14 @@ msgstr "Utvalg: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:307 msgid "Undock the panel" msgstr "Frigjør panelet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:321 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." msgstr "Lukk panelet. Du kan åpne det med knappene i venstre verktøygruppe." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:332 msgid "Click to minimize/maximize the panel content" msgstr "Klikk for at minimere/maksimere panelet" @@ -6607,5 +6605,5 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 #: build/trans_presets.java:67 build/trans_presets.java:103 #: build/trans_presets.java:143 build/trans_presets.java:180 @@ -6983,7 +6981,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 -#, fuzzy msgid "Save/Upload and Exit" -msgstr "Lagre og avslutt" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 @@ -6992,7 +6989,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 -#, fuzzy msgid "Save/Upload and Delete" -msgstr "Opplastingen ble avsluttet" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 @@ -7206,5 +7202,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:627 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -7558,9 +7554,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:324 -#, fuzzy, java-format +#, java-format msgid "There was {0} conflict detected." msgid_plural "There were {0} conflicts detected." -msgstr[0] "Det oppstod {0} konflikter under import." -msgstr[1] "Det oppstod {0} konflikter under import." +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 @@ -7576,7 +7572,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345 -#, fuzzy msgid "Conflicts detected" -msgstr "Konflikt oppdaget" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:472 @@ -7921,5 +7916,5 @@ msgstr "Stemme recorder kalibrering" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Farge" @@ -8918,5 +8913,5 @@ msgstr "Klarte ikke lese fil «{0}»" -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310 +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313 msgid "Parse error: invalid document structure for GPX document." msgstr "Lesefeil: Strukturen i GPX fila er ukjent" @@ -9099,19 +9094,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:516 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:599 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:601 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9588,7 +9583,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' must not be null" -msgstr "parameter «{0}» må ha en verdi" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141 @@ -10318,69 +10313,73 @@ msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:373 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381 msgid "City:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:374 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382 msgid "State:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:375 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383 msgid "Post Code:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:376 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384 msgid "Country:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:377 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385 msgid "Full Address:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:412 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420 msgid "Optional Information:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:592 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600 msgid "Please select a street to associate with address interpolation way" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:605 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613 msgid "Please select address interpolation way for this street" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:711 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719 msgid "Expected odd numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:716 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 msgid "Expected even numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 msgid "Country code must be 2 letters" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:870 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878 msgid "Please enter valid number for starting and ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:876 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896 msgid "Alphabetic address must end with a letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:881 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911 +msgid "Starting and ending numbers must be the same for alphabetic addresses" +msgstr "" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917 msgid "Starting address letter must be less than ending address letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:897 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933 msgid "Please enter valid number for starting address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:900 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936 msgid "Please enter valid number for ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:907 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943 msgid "Starting address number must be less than ending address number" msgstr "" @@ -20032,24 +20031,20 @@ #. item "Man Made/Tower" text "Name" #: build/trans_presets.java:2296 -#, fuzzy msgid "Tower type" -msgstr "Rutetype" +msgstr "" #. item "Man Made/Tower" combo "Tower type" #: build/trans_presets.java:2296 -#, fuzzy msgid "communication" -msgstr "forbindelse" +msgstr "" #: build/trans_presets.java:2296 -#, fuzzy msgid "observation" -msgstr "Høyde" +msgstr "" #. #: build/trans_presets.java:2298 -#, fuzzy msgid "Height (meters)" -msgstr "Max. Høyde (meter)" +msgstr "" #. item "Man Made/Tower" text "Operator" @@ -20109,7 +20104,6 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "oil" -msgstr "fossil" +msgstr "" #: build/trans_presets.java:2330 build/trans_presets.java:2372 @@ -20118,27 +20112,22 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "sewage" -msgstr "bruk" +msgstr "" #: build/trans_presets.java:2330 -#, fuzzy msgid "heat" -msgstr "beiteområde" +msgstr "" #: build/trans_presets.java:2330 -#, fuzzy msgid "any substance" -msgstr "A etter Avstand" +msgstr "" #: build/trans_presets.java:2331 -#, fuzzy msgid "underwater" -msgstr "vann" +msgstr "" #: build/trans_presets.java:2331 -#, fuzzy msgid "overground" -msgstr "P-kjeller" +msgstr "" #: build/trans_presets.java:2333 @@ -20283,17 +20272,14 @@ #. item "Man Made/Power Tower" combo "Type" #: build/trans_presets.java:2398 -#, fuzzy msgid "tower" -msgstr "Tårn" +msgstr "" #: build/trans_presets.java:2398 -#, fuzzy msgid "pole" -msgstr "Rolle" +msgstr "" #: build/trans_presets.java:2399 -#, fuzzy msgid "Tower reference" -msgstr "Linjenummer" +msgstr "" #. item "Man Made/Power Tower" text "Tower reference" @@ -20311,18 +20297,15 @@ #. item "Man Made/Power Line" label "Edit Power Line" #: build/trans_presets.java:2405 -#, fuzzy msgid "Line type" -msgstr "Løypetype" +msgstr "" #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2405 -#, fuzzy msgid "line" -msgstr "koblet" +msgstr "" #: build/trans_presets.java:2405 -#, fuzzy msgid "minor_line" -msgstr "motorway_link" +msgstr "" #. item "Man Made/Power Line" text "Line reference" @@ -20333,7 +20316,6 @@ #. item "Man Made/Power Line" text "Voltage" #: build/trans_presets.java:2409 -#, fuzzy msgid "Amount of Cables" -msgstr "Antall ledere" +msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" @@ -20344,22 +20326,18 @@ #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" #: build/trans_presets.java:2410 -#, fuzzy msgid "single" -msgstr "Vinkel" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "double" -msgstr "Boule" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "triple" -msgstr "Gjerdetrapp" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "quad" -msgstr "quaker" +msgstr "" #: build/trans_presets.java:2413 @@ -26254,35 +26232,15 @@ msgstr "" -#~ msgid "Combine ways with different memberships?" -#~ msgstr "Sammenføye linjer med forskjellig tilhørighet?" +#~ msgid "Move" +#~ msgstr "Flytt" + +#~ msgid "Unsaved Changes" +#~ msgstr "Ulagrede endringer" + +#~ msgid "Some of the nodes are (almost) in the line" +#~ msgstr "Noen av nodene er (nesten) på linje" #~ msgid "Combine Anyway" #~ msgstr "Sammenføy uansett" - -#~ msgid "" -#~ "The selected ways have differing relation memberships. Do you still want " -#~ "to combine them?" -#~ msgstr "Vil du virkelig sammenføye linjer med forskjellig tilhørighet?" - -#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -#~ msgstr "Feillinje «{0}» samsvarer ikke med forventet mønster «{1}»" - -#~ msgid "Purging 1 primitive" -#~ msgstr "Rydder ut 1 objekt" - -#~ msgid "removing reference from way {0}" -#~ msgstr "fjerner henvisning fra vei {0}" - -#~ msgid "Empty member in relation." -#~ msgstr "Tomt medlem i relasjon." - -#~ msgid "Move" -#~ msgstr "Flytt" - -#~ msgid "Unsaved Changes" -#~ msgstr "Ulagrede endringer" - -#~ msgid "Some of the nodes are (almost) in the line" -#~ msgstr "Noen av nodene er (nesten) på linje" #~ msgid "Email" @@ -26690,4 +26648,12 @@ #~ msgstr "Last inn TCX filer direkte fra JOSM." +#~ msgid "Combine ways with different memberships?" +#~ msgstr "Sammenføye linjer med forskjellig tilhørighet?" + +#~ msgid "" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" +#~ msgstr "Vil du virkelig sammenføye linjer med forskjellig tilhørighet?" + #~ msgid "All the ways were empty" #~ msgstr "Alle linjene var tomme" @@ -26751,4 +26717,7 @@ #~ msgstr "linjer" +#~ msgid "Empty member in relation." +#~ msgstr "Tomt medlem i relasjon." + #~ msgid "Contacting the OSM server..." #~ msgstr "Kontakter OSM-tjeneren …" @@ -26762,4 +26731,10 @@ #~ msgid "Missing primitive" #~ msgstr "Mangler objekt" + +#~ msgid "Purging 1 primitive" +#~ msgstr "Rydder ut 1 objekt" + +#~ msgid "removing reference from way {0}" +#~ msgstr "fjerner henvisning fra vei {0}" #~ msgid "Failed to load history from the server. Details:
{0}" @@ -26845,4 +26820,7 @@ #~ "Ikke last opp data etter denne meldingen." +#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +#~ msgstr "Feillinje «{0}» samsvarer ikke med forventet mønster «{1}»" + #~ msgid "parameter '{0}' must not be null" #~ msgstr "parameter «{0}» må ha en verdi"