Changeset 17708 in osm for applications/editors/josm/i18n/po/sl.po

Timestamp:

2009-09-20T11:18:42+02:00 (17 years ago)

Author:

stoecker

Message:

updated

File:

• applications/editors/josm/i18n/po/sl.po (modified) (67 diffs)

applications/editors/josm/i18n/po/sl.po

@@ -8 +8 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-19 13:00+0200\n"
-"PO-Revision-Date: 2009-09-15 04:21+0000\n"
+"POT-Creation-Date: 2009-09-20 11:11+0200\n"
+"PO-Revision-Date: 2009-09-19 12:17+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -17 +17 @@
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
-"X-Launchpad-Export-Date: 2009-09-19 10:42+0000\n"
+"X-Launchpad-Export-Date: 2009-09-20 08:26+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -148 +148 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196
+#: ../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
@@ -190 +190 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:498
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
+#: ../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:54
@@ -513 +513 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:229
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
@@ -638 +638 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
-#, fuzzy
 msgid "Close open changesets"
-msgstr "paketi sprememb"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
-#, fuzzy
 msgid "Closes open changesets"
-msgstr "paketi sprememb"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
@@ -668 +666 @@
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
-#, fuzzy
 msgid "No open changesets"
-msgstr "paketi sprememb"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
-#, fuzzy
 msgid "Downloading open changesets ..."
-msgstr "Sprejemanje podatkov OSM..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
@@ -745 +741 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273
 msgid "Create Circle"
 msgstr "Ustvari krog"
@@ -753 +749 @@
 msgstr "Skozi izbrana tri vozlišča ustvari krog"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 msgid "Those nodes are not in a circle. Aborting."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -766 +762 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:418
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
@@ -919 +915 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
+#: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:395
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:51
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:99
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:249
+#: ../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/dialogs/HistoryDialog.java:179
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51
+#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60
-#, java-format
-msgid "paramenter ''{0}'' must not be null"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
+#, java-format
+msgid "parameter ''{0}'' must not be null"
+msgstr "parameter ''{0}'' ne sme biti ničen"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72
@@ -982 +1056 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:218
 #, java-format
-msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
+msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
 msgstr ""
 
@@ -988 +1062 @@
 #, java-format
 msgid ""
-"Help page missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF=\"{1}"
+"Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF=\"{1}"
 "\">your language</A>."
 msgstr ""
@@ -1047 +1121 @@
 msgid "Please select at least two nodes to merge."
 msgstr "Izberite vsaj dve vozlišči za združitev"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
-#: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:394
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:51
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:99
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:249
-#: ../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/dialogs/HistoryDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51
-#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
-#, java-format
-msgid "parameter ''{0}'' must not be null"
-msgstr "parameter ''{0}'' ne sme biti ničen"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
@@ -1775 +1788 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
-#, fuzzy
 msgid "Changeset closed"
-msgstr "paketi sprememb"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
@@ -2173 +2185 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
-#, fuzzy
 msgid "Please enter a filter string."
-msgstr "Prosim, vnesite iskalni izraz."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
@@ -2194 +2205 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74
-#, fuzzy
 msgid "find in selection"
-msgstr "dodaj v izbor"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81
@@ -2332 +2342 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
-#, fuzzy, java-format
+#, java-format
 msgid "Nothing find in selection by searching for ''{0}''"
-msgstr "Z iskanjem ''{0}'' ni bilo v izbor dodano ničesar"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262
@@ -2361 +2371 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:174
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:216
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:356
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:510
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:512
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:530
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:532
 msgid "Missing arguments for or."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:542
 msgid "Missing argument for not."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:550
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:552
 msgid "Expected closing parenthesis."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:612
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614
 msgid "Wrong number of parameters for nodes operator."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:616
 #, java-format
 msgid ""
@@ -2403 +2413 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:623
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2538 +2548 @@
 #, java-format
 msgid ""
-"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for "
+"Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for "
 "primitmive ''{1}''"
 msgstr ""
@@ -2550 +2560 @@
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90
-msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
+msgid ""
+"Can't undo command ''{0}'' because layer ''{1}'' is not present any more"
 msgstr ""
 
@@ -2592 +2603 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196
 msgid "Conflicting relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
 msgid "Delete from relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:203
 #, java-format
 msgid ""
@@ -2608 +2619 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:214
 #, java-format
 msgid ""
@@ -2615 +2626 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:449
 msgid "Split way segment"
 msgstr ""
@@ -2621 +2632 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:470
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:138
 msgid ""
@@ -2629 +2640 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:481
 msgid "Delete confirmation"
 msgstr ""
@@ -2734 +2745 @@
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
 #, java-format
-msgid "Resolve conflicts in node list of of way {0}"
+msgid "Resolve conflicts in node list of way {0}"
 msgstr ""
 
@@ -2942 +2953 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393
 #, java-format
 msgid "parameter {0} > 0 required. Got {1}."
@@ -2952 +2963 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
-#, fuzzy
 msgid "Text"
-msgstr "besedilo"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
@@ -3060 +3070 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78
-msgid "Didn't find an  primitive with id {0} in this dataset"
+msgid "Didn't find an primitive with id {0} in this dataset"
 msgstr ""
 
@@ -3724 +3734 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418
-#, fuzzy
 msgid "User:"
-msgstr "Uporabniško ime"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
@@ -4076 +4085 @@
 msgstr[0] ""
 msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98
-#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
-#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
-#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134
-msgid "parameter '{0}' must not be null"
-msgstr "parameter '{0}' ne sme biti ničen"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884
@@ -4482 +4467 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:65
 #, java-format
-msgid "The key ''{0}'' and all it's values are going to be removed"
+msgid "The key ''{0}'' and all its values are going to be removed"
 msgstr ""
 
@@ -4753 +4738 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
-#, fuzzy
 msgid "Add filter."
-msgstr "Dodaj izbrano"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
-#, fuzzy
 msgid "Edit filter."
-msgstr "Uredi pomol"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
-#, fuzzy
 msgid "Delete filter."
-msgstr "Izberite bodisi:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
-#, fuzzy
 msgid "Move filter up."
-msgstr "Premakni navzgor"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
-#, fuzzy
 msgid "Move filter down."
-msgstr "Premakni navzdol"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128
@@ -4782 +4762 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129
-#, fuzzy
 msgid "Hide elements"
-msgstr "Posamezen element"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
@@ -4795 +4774 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
-#, fuzzy
 msgid "Filter mode"
-msgstr "Način za brisanje"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
@@ -5074 +5052 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442
 msgid "Undock the panel"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465
 msgid "Click to minimize/maximize the panel content"
 msgstr ""
@@ -5214 +5192 @@
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
-"relation itself.<br>This creates circular dependencies and is dicuraged."
+"relation itself.<br>This creates circular dependencies and is discouraged."
 "<br>How do you want to proceed with circular dependencies?</html>"
 msgstr ""
@@ -6677 +6655 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
-#, fuzzy
 msgid "Changeset id:"
-msgstr "paketi sprememb"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36
-#, fuzzy
 msgid "Created at:"
-msgstr "Ustvari površine"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39
-#, fuzzy
 msgid "Changeset comment:"
-msgstr "Spremeni relacijo"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67
@@ -6696 +6671 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48
-#, fuzzy
 msgid "<html>Please select the changesets you want to close</html>"
-msgstr "Izberite vsaj eno pot, ki jo želite poenostaviti."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74
-#, fuzzy
 msgid "Open changesets"
-msgstr "paketi sprememb"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101
-#, fuzzy
 msgid "Close changesets"
-msgstr "paketi sprememb"
+msgstr ""
 
 #. putValue(SMALL_ICON, ImageProvider.get("cancel"));
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103
-#, fuzzy
 msgid "Close the selected open changesets"
-msgstr "Izbriši izbrane predmete."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126
-msgid "Cancel closeing of changesets"
+msgid "Cancel closing of changesets"
 msgstr ""
 
@@ -6725 +6696 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77
-#, fuzzy, java-format
+#, java-format
 msgid "Closing changeset {0}"
-msgstr "Zadnja sprememba {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
@@ -7037 +7008 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606
-#, fuzzy
 msgid "Upload all changes in one request"
-msgstr "Pošlji vse spremembe na strežnik OSM."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607
@@ -7052 +7022 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:672
-#, fuzzy
 msgid "Open a new changeset"
-msgstr "paketi sprememb"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673
@@ -7061 +7030 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680
-#, fuzzy
 msgid "Use an open changeset"
-msgstr "Neshranjene spremembe"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681
@@ -7070 +7038 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721
-#, fuzzy
 msgid "Close changeset after upload"
-msgstr "Ni sprememb za pošiljanje."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722
@@ -7087 +7054 @@
 #. putValue(NAME, tr("Reload"));
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938
-#, fuzzy
 msgid "Load the list of your open changesets from the server"
-msgstr "Prenos trenutnih nastavitev na strežnik"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951
-#, fuzzy
 msgid "Close the currently selected open changeset"
-msgstr "Pomakni izbranega člana vrstico višje."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
@@ -7302 +7267 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
-#, fuzzy, java-format
+#, java-format
 msgid "{0} track"
 msgid_plural "{0} tracks"
-msgstr[0] "sledi"
-msgstr[1] "sled"
-msgstr[2] "sledi"
-msgstr[3] "sledi"
+msgstr[0] ""
+msgstr[1] ""
 
 #. item "Relations/Route" text "Symbol description"
@@ -7322 +7285 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
-#, fuzzy
 msgid "Length"
-msgstr "Dolžina poti"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
@@ -8633 +8595 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group ''{0}'' of group ''{1}''"
-msgstr "Uporabi prednastavitev ''{0}'' iz skupine ''{1}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
@@ -8658 +8620 @@
 #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
-#, fuzzy, java-format
+#, java-format
 msgid "parameter ''{0}'' > 0 expected. Got {1}"
-msgstr "parameter ''{0}'' ne sme biti ničen"
+msgstr ""
 
 #. SAXException does not chain correctly
@@ -8862 +8824 @@
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56
-msgid "NMEA import faliure!"
+msgid "NMEA import failure!"
 msgstr ""
 
@@ -9359 +9321 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51
-#, fuzzy
 msgid "Reading changesets..."
-msgstr "paketi sprememb"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57
-#, fuzzy
 msgid "Downloading changesets ..."
-msgstr "Sprejemanje..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85
-#, fuzzy, java-format
+#, java-format
 msgid "Reading changeset {0} ..."
-msgstr "Berem {0}..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91
-#, fuzzy, java-format
+#, java-format
 msgid "Downloading changeset {0} ..."
-msgstr "Sprejem točk od {0} do {1}..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
@@ -9415 +9375 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
-#, fuzzy, java-format
+#, java-format
 msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
-msgstr "Uporabi prednastavitev ''{0}'' iz skupine ''{1}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
@@ -10963 +10923 @@
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
-msgid "TangoGPS import faliure!"
+msgid "TangoGPS import failure!"
 msgstr ""
 
@@ -11683 +11643 @@
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45
-#, fuzzy
 msgid "Please select 4 or 5 ways to assign no left turns."
-msgstr "Izberite vsaj eno pot, ki jo želite poenostaviti."
+msgstr ""
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "{0} extrem nodes."
-msgstr "{0} točk"
+msgstr ""
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69
@@ -11698 +11657 @@
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75
-#, fuzzy, java-format
+#, java-format
 msgid "{0} via nodes."
-msgstr "{0} točk"
+msgstr ""
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78
@@ -11707 +11666 @@
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98
-#, fuzzy, java-format
+#, java-format
 msgid "MIddle way: {0}"
-msgstr "Način: {0}"
+msgstr ""
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121
@@ -11716 +11675 @@
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129
-#, fuzzy, java-format
+#, java-format
 msgid "Processing {0}"
-msgstr "Različica {0}"
+msgstr ""
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142
@@ -11739 +11698 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94
 msgid ""
-"<html>The openstreetbus plugin is using the old server at appspot.com.<br>A "
+"<html>The openstreetbugs plugin is using the old server at appspot.com.<br>A "
 "new server is available at schokokeks.org.<br>Do you want to switch to the "
 "new server? (Strongly recommended)</html>"
@@ -13454 +13413 @@
 #, java-format
 msgid ""
-"<html>The base URL<br>''{0}''<br>for this WML layer does neither end with a "
+"<html>The base URL<br>''{0}''<br>for this WMS layer does neither end with a "
 "''&'' nor with a ''?''.<br>This is likely to lead to invalid WMS request. "
 "You should check your<br>preference settings.<br>Do you want to fetch WMS "
@@ -13725 +13684 @@
 #: build/trans_plugins.java:37
 msgid ""
-"Simulates a click when you do a small and short drag. This is usefull for "
+"Simulates a click when you do a small and short drag. This is useful for "
 "tablet pens, when you have problems just clicking the tablet without the "
 "mouse moving (general Java - tablet problem)."
@@ -13899 +13858 @@
 #. <annotations>
 #: build/trans_presets.java:57
-#, fuzzy
 msgid "Highways"
-msgstr "cesta"
+msgstr ""
 
 #. group "Highways"
@@ -16534 +16492 @@
 #. item "Waterway Point/Slipway" text "Name"
 #: build/trans_presets.java:1250
-#, fuzzy
 msgid "Transport"
-msgstr "Javni prevoz"
+msgstr ""
 
 #. group "Transport"
@@ -17353 +17310 @@
 #. </optional>
 #: build/trans_presets.java:1567
-#, fuzzy
 msgid "Travel"
-msgstr "Shrani"
+msgstr ""
 
 #. group "Travel"
@@ -17976 +17932 @@
 #. item "Historic Places/Wayside Shrine" text "Name"
 #: build/trans_presets.java:1852
-#, fuzzy
 msgid "Boundary Stone"
-msgstr "Meje"
+msgstr ""
 
 #. item
 #: build/trans_presets.java:1853
-#, fuzzy
 msgid "Edit Boundary Stone"
-msgstr "Uredu avtobusno postajališče"
+msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
@@ -25712 +25666 @@
 msgstr ""
 
+#~ msgid "parameter '{0}' must not be null"
+#~ msgstr "parameter '{0}' ne sme biti ničen"
+
 #~ msgid "Move"
 #~ msgstr "Premakni"