Index: applications/editors/josm/i18n/po/is.po
===================================================================
--- applications/editors/josm/i18n/po/is.po	(revision 17822)
+++ applications/editors/josm/i18n/po/is.po	(revision 17946)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-28 16:38+0200\n"
-"PO-Revision-Date: 2009-09-28 13:34+0000\n"
+"POT-Creation-Date: 2009-10-02 22:03+0200\n"
+"PO-Revision-Date: 2009-09-28 17:18+0000\n"
 "Last-Translator: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n"
 "Language-Team: Icelandic <is@li.org>\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:33+0000\n"
+"X-Launchpad-Export-Date: 2009-10-02 19:25+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 "Niðurhel lista yfir opin breytingarsett ..."
 
-#: ../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 "Sameina vegi"
 
-#: ../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 "Sameina marga vegi í einn."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 msgid "Change directions?"
 msgstr "Skipta um átt?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
 msgid "Reverse and Combine"
 msgstr "Skipta um átt og sameina"
 
-#: ../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 @@
 "haldist sér. Vilt þú skipta um átt sumra þeirra?"
 
-#: ../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 "
@@ -652,10 +652,10 @@
 "að sameina þá þurfa þeir að vera ein samfelld röð af hnútum"
 
-#: ../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 "Sameina {0} vegi"
 
-#: ../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 "Vinsamlegast veldu a.m.k. tvo vegi til að sameina."
@@ -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
@@ -1042,22 +1042,22 @@
 msgstr "Sameina það lag sem nú er valið öðru lagi"
 
-#: ../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 "Sameina hnúta"
 
-#: ../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 "Sameina valda hnúta á staðsetningu þess elsta."
 
-#: ../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 "Veldu minnst tvo hnúta til að sameina."
 
-#: ../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 "Gat ekki sameinað hnúta: Hefði þurft að eyða veg sem enn er í notkun."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261
 #, java-format
 msgid "Merge {0} nodes"
@@ -1234,5 +1234,5 @@
 msgstr "Líma eigindi hluta á klemmuborðinu á alla valda hluti."
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:106
 #, java-format
 msgid "Pasting {0} tag"
@@ -1241,5 +1241,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"
@@ -2120,37 +2120,37 @@
 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 "Sláðu inn leitarstreng"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73
 msgid "replace selection"
 msgstr "skipta út vali"
 
-#: ../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 "bæta við val"
 
-#: ../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 "fjarlæga úr vali"
 
-#: ../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 "stafsetursnæmt"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84
 msgid "regular expression"
 msgstr "regluleg segð"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
 msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
 msgstr ""
@@ -2158,18 +2158,18 @@
 "gildi."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
 msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
 msgstr ""
 "<b>\"Gamla Hringbraut\"</b> - „Gamla Hringbraut“ í einhverjum lykli og gildi."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
 msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
 msgstr "<b>name:Gam</b> - „Gam“ kemur fyrir í nafninu."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
 msgstr "<b>type=route</b> - lykilinn „type“ með gildið „route“."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
 msgid ""
 "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
@@ -2179,17 +2179,17 @@
 "<b>*=gildi</b>, <b>type=</b>, <b>*=*</b> og <b>*=</b>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
 msgid "<b>-name:Bak</b> - not 'Bak' in the name."
 msgstr "<b>-name:Gam</b> - „Gam“ kemur ekki fyrir í nafninu."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - Lykillinn „foot“ með eitthvað gildi."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
 msgid "<u>Special targets:</u>"
 msgstr "<u>Sérleitir:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
@@ -2198,47 +2198,47 @@
 "fyrir hnút, veg og vensl"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>... - Hlutir sem breytt hefur verið af gefnum notanda"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr "<b>id:</b>... - hlutur með þessa kennitölu (0 fyrir nýja hluti)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
 msgid "<b>nodes:</b>... - object with given number of nodes"
 msgstr "<b>nodes:</b>... - Hlutur með gefið marga hnúta (t.d. „5“ eða „7-9“)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - Hlutum sem breytt hefur verið"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - Valdir hlutir"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - Ókláraðir hlutir"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - Hlutir án eiginda"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr "<b>child <i>segð</i></b> - allir undirhlutir sem passa við segðina"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr "<b>parent <i>segð</i></b> - allir yfirhlutir sem passa við segðina"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "Notaðu <b>|</b> eða <b>OR</b> t.d. „A | B“ til að leita að A eða B"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
@@ -2246,9 +2246,9 @@
 "„:“ eða „ “"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Notaðu <b>(</b> og <b>)</b> til að sameina segðir"
 
-#: ../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
@@ -2258,51 +2258,51 @@
 msgstr ""
 
-#: ../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 "Leit"
 
-#: ../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 "Hefja leit"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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
+#, java-format
+msgid "Nothing found in selection by searching for ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264
 #, java-format
 msgid "Found {0} matches"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284
 msgid "CS"
 msgstr "stafsetursnæmt"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284
 msgid "CI"
 msgstr "stafsetursónæmt"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285
 msgid "RX"
 msgstr ""
@@ -2612,5 +2612,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 "Fjarlægja úr venslum"
@@ -2667,12 +2667,12 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107
-#, fuzzy, java-format
+#, java-format
 msgid "Purged object ''{0}''"
-msgstr "Nota forstillinguna „{0}“"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Purged {0} objects"
-msgstr "Breyta {0} hlut"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160
@@ -2684,7 +2684,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169
-#, fuzzy, java-format
+#, java-format
 msgid "Removing reference from relation {0}"
-msgstr "Eyða valinu úr venslunum {0}?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
@@ -3045,14 +3045,14 @@
 msgstr "Viðvörun: {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
@@ -3060,5 +3060,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}."
@@ -3406,7 +3406,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
@@ -3448,7 +3446,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
-#, fuzzy
 msgid "Not Found"
-msgstr "Skrá fannst ekki"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:155
@@ -3754,9 +3751,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:289
 msgid "(no object)"
 msgstr "(enginn hlutur)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:416
 msgid "User:"
 msgstr ""
@@ -4220,5 +4217,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 ""
@@ -4319,5 +4316,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
@@ -4364,6 +4361,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
@@ -4377,6 +4374,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
@@ -4434,34 +4431,34 @@
 msgstr ""
 
-#: ../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
@@ -4479,23 +4476,23 @@
 msgstr ""
 
-#: ../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}''"
@@ -4539,7 +4536,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
@@ -4549,7 +4566,5 @@
 msgstr[1] "{0} vegir"
 
-#: ../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
@@ -4558,26 +4573,4 @@
 msgstr[0] "{0} vensl"
 msgstr[1] "{0} vensl"
-
-#: ../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
@@ -4646,4 +4639,13 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:42
+#, fuzzy
+msgid "<html>Please select the values to keep for the following tags.</html>"
+msgstr "<html>Veldu þau breytingarsett sem þú vilt loka</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:47
+msgid "Show tags with conflicts only"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
@@ -4661,5 +4663,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
@@ -4752,5 +4754,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
@@ -4906,6 +4908,6 @@
 msgstr "Upplýsingar um lag"
 
-#: ../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."
@@ -4914,22 +4916,22 @@
 msgstr[1] "Allt að {0} hlutum verður breytt."
 
-#: ../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 "Tómt gildi eyðir lyklinum"
 
-#: ../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 "<different>"
 msgstr "<mismunandi>"
 
-#: ../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 "Breyta eigindum"
 
-#: ../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"
@@ -4938,69 +4940,69 @@
 msgstr[1] "Breyta eigindum allt að {0} hluta"
 
-#: ../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 "Veldu lykil"
 
-#: ../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 "Veldu gildi"
 
-#: ../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 "Veldu hluti til að breyta eigindum þeirra."
 
+#: ../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 "Eigindi"
 
-#: ../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 "Eigindi valdra hluta."
 
 #. 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 "Stak í"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:575
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576
 msgid "Add Properties"
 msgstr "Bæti vað eigindum"
 
-#: ../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 "Bæta nýjum eigindum við valda hluti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:581
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582
 msgid "Edit Properties"
 msgstr "Breyta eigindum"
 
-#: ../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 "Breyta gildi valins lykils í öllum völdum hlutum"
 
-#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:798
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799
 msgid "Properties / Memberships"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:838
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839
 msgid "Change relation"
 msgstr "Breyta venslum"
 
-#: ../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 "Eyða valinu úr venslunum {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 "Eyða völdum lykil í öllum völdum hlutum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:861
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862
 msgid "Delete Properties"
 msgstr "Eyða eigindum"
@@ -5042,7 +5044,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440
-#, fuzzy
 msgid "Set the current selection to the list of selected relations"
-msgstr "Opna ritil til að breyta völdum venslum"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5083,9 +5084,9 @@
 msgstr "Val: {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 "Opna þessa stiku sem glugga"
 
-#: ../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."
@@ -5094,5 +5095,5 @@
 "vinstri tólastikunni."
 
-#: ../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 "Smelltu til að minnka/hámarka innihald stikunnar"
@@ -6517,5 +6518,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
@@ -6893,7 +6894,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
-#, fuzzy
 msgid "Save/Upload and Exit"
-msgstr "Vista og hætta"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
@@ -6902,7 +6902,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354
-#, fuzzy
 msgid "Save/Upload and Delete"
-msgstr "Vista og eyða"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
@@ -7120,5 +7119,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}."
@@ -7482,7 +7481,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345
-#, fuzzy
 msgid "Conflicts detected"
-msgstr "Árekstrar"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:472
@@ -7809,5 +7807,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 msgid "Color"
 msgstr "Litur"
@@ -8776,5 +8774,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -8953,19 +8951,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}."
@@ -10149,69 +10147,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 ""
@@ -19718,24 +19720,20 @@
 #. item "Man Made/Tower" text "Name"
 #: build/trans_presets.java:2296
-#, fuzzy
 msgid "Tower type"
-msgstr "Turn"
+msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
 #: build/trans_presets.java:2296
-#, fuzzy
 msgid "communication"
-msgstr "Hringtorg"
+msgstr ""
 
 #: build/trans_presets.java:2296
-#, fuzzy
 msgid "observation"
-msgstr "Hæð (y/s)"
+msgstr ""
 
 #. <optional>
 #: build/trans_presets.java:2298
-#, fuzzy
 msgid "Height (meters)"
-msgstr "Hámarkshæð (í metrum)"
+msgstr ""
 
 #. item "Man Made/Tower" text "Operator"
@@ -19795,7 +19793,6 @@
 
 #: build/trans_presets.java:2330
-#, fuzzy
 msgid "oil"
-msgstr "Salerni"
+msgstr ""
 
 #: build/trans_presets.java:2330 build/trans_presets.java:2372
@@ -19808,7 +19805,6 @@
 
 #: build/trans_presets.java:2330
-#, fuzzy
 msgid "heat"
-msgstr "Leikhús"
+msgstr ""
 
 #: build/trans_presets.java:2330
@@ -19817,12 +19813,10 @@
 
 #: build/trans_presets.java:2331
-#, fuzzy
 msgid "underwater"
-msgstr "vatn"
+msgstr ""
 
 #: build/trans_presets.java:2331
-#, fuzzy
 msgid "overground"
-msgstr "bakgrunnur"
+msgstr ""
 
 #: build/trans_presets.java:2333
@@ -19967,17 +19961,14 @@
 #. item "Man Made/Power Tower" combo "Type"
 #: build/trans_presets.java:2398
-#, fuzzy
 msgid "tower"
-msgstr "Turn"
+msgstr ""
 
 #: build/trans_presets.java:2398
-#, fuzzy
 msgid "pole"
-msgstr "Hlutverk"
+msgstr ""
 
 #: build/trans_presets.java:2399
-#, fuzzy
 msgid "Tower reference"
-msgstr "Tilvísunarnúmer línunnar"
+msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
@@ -19995,18 +19986,15 @@
 #. item "Man Made/Power Line" label "Edit Power Line"
 #: build/trans_presets.java:2405
-#, fuzzy
 msgid "Line type"
-msgstr "gerð"
+msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
 #: build/trans_presets.java:2405
-#, fuzzy
 msgid "line"
-msgstr "tengd"
+msgstr ""
 
 #: build/trans_presets.java:2405
-#, fuzzy
 msgid "minor_line"
-msgstr "tengibraut á hraðbraut"
+msgstr ""
 
 #. item "Man Made/Power Line" text "Line reference"
@@ -20017,7 +20005,6 @@
 #. item "Man Made/Power Line" text "Voltage"
 #: build/trans_presets.java:2409
-#, fuzzy
 msgid "Amount of Cables"
-msgstr "Fjöldi víra"
+msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
@@ -20028,17 +20015,14 @@
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
 #: build/trans_presets.java:2410
-#, fuzzy
 msgid "single"
-msgstr "Horn"
+msgstr ""
 
 #: build/trans_presets.java:2410
-#, fuzzy
 msgid "double"
-msgstr "Hlutverk"
+msgstr ""
 
 #: build/trans_presets.java:2410
-#, fuzzy
 msgid "triple"
-msgstr "Skrá"
+msgstr ""
 
 #: build/trans_presets.java:2410
@@ -25937,9 +25921,60 @@
 msgstr ""
 
+#~ msgid "Aborting..."
+#~ msgstr "Hætti við..."
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "Óvistaðar breytingar"
+
+#~ msgid "Plugin requires JOSM update: {0}."
+#~ msgstr "Uppfæra þarf JOSM til að viðbótin „{0}“ geti verið notuð."
+
+#~ msgid "OSM username (email)"
+#~ msgstr "OSM notandanafn (getur verið tölvupóstfang)"
+
+#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
+#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
+#~ msgstr[0] "{0} viðbót var uppfærð. Vinsamlegast endurræstu JOSM."
+#~ msgstr[1] "{0} viðbætur voru uppfærðar. Vinsamlegast endurræstu JOSM."
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Óþekkt skráarending"
+
+#~ msgid "Could not download plugin: {0} from {1}"
+#~ msgstr "Gat ekki halað niður viðbótinni {0} frá {1}"
+
+#~ msgid ""
+#~ "Server returned internal error. Try a reduced area or retry after waiting "
+#~ "some time."
+#~ msgstr ""
+#~ "Það kom upp innri villa á þjóninum. Prófaðu að hala niður minna svæði eða "
+#~ "reyna síðar."
+
+#~ msgid "Unknown version"
+#~ msgstr "Óþekkt útgáfa"
+
+#~ msgid "Email"
+#~ msgstr "Netfang"
+
+#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgstr ""
+#~ "Þú getur notað músina eða Ctrl+örvarlykla/./ til að þysja og hliðra."
+
+#~ msgid "Add all currently selected objects as members"
+#~ msgstr "Bæta völdum hlutum við venslin"
+
+#~ msgid "unnamed"
+#~ msgstr "ónefnt"
+
+#~ msgid "Conflicts: {0}"
+#~ msgstr "Árekstrar: {0}"
+
+#~ msgid "{0} object has conflicts:"
+#~ msgid_plural "{0} objects have conflicts:"
+#~ msgstr[0] "{0} hlutur hefur árekstra:"
+#~ msgstr[1] "{0} hlutir hafa árekstra:"
+
 #~ msgid "Combine ways with different memberships?"
 #~ msgstr "Sameina vegi sem eru stak í mismunandi venslum?"
-
-#~ msgid "Combine Anyway"
-#~ msgstr "Sameina þá"
 
 #~ msgid ""
@@ -25950,58 +25985,4 @@
 #~ "það?"
 
-#~ msgid "Aborting..."
-#~ msgstr "Hætti við..."
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Óvistaðar breytingar"
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "Uppfæra þarf JOSM til að viðbótin „{0}“ geti verið notuð."
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM notandanafn (getur verið tölvupóstfang)"
-
-#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] "{0} viðbót var uppfærð. Vinsamlegast endurræstu JOSM."
-#~ msgstr[1] "{0} viðbætur voru uppfærðar. Vinsamlegast endurræstu JOSM."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Óþekkt skráarending"
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Gat ekki halað niður viðbótinni {0} frá {1}"
-
-#~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
-#~ msgstr ""
-#~ "Það kom upp innri villa á þjóninum. Prófaðu að hala niður minna svæði eða "
-#~ "reyna síðar."
-
-#~ msgid "Unknown version"
-#~ msgstr "Óþekkt útgáfa"
-
-#~ msgid "Email"
-#~ msgstr "Netfang"
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-#~ msgstr ""
-#~ "Þú getur notað músina eða Ctrl+örvarlykla/./ til að þysja og hliðra."
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Bæta völdum hlutum við venslin"
-
-#~ msgid "unnamed"
-#~ msgstr "ónefnt"
-
-#~ msgid "Conflicts: {0}"
-#~ msgstr "Árekstrar: {0}"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} hlutur hefur árekstra:"
-#~ msgstr[1] "{0} hlutir hafa árekstra:"
-
 #~ msgid "sports"
 #~ msgstr "íþróttir"
@@ -26102,4 +26083,7 @@
 #~ msgstr "Ekki var náð í nein gögn"
 
+#~ msgid "Combine Anyway"
+#~ msgstr "Sameina þá"
+
 #~ msgid "Deleting layer {0} of {1}"
 #~ msgstr "Eyði lagi {0} af {1}"