Index: applications/editors/josm/i18n/po/nb.po
===================================================================
--- applications/editors/josm/i18n/po/nb.po	(revision 19934)
+++ applications/editors/josm/i18n/po/nb.po	(revision 19979)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-08 15:25+0100\n"
+"POT-Creation-Date: 2010-02-12 15:42+0100\n"
 "PO-Revision-Date: 2010-01-23 21:14+0000\n"
 "Last-Translator: Tor Christian Tovslid <tctovsli@gmail.com>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-02-07 18:58+0000\n"
+"X-Launchpad-Export-Date: 2010-02-12 14:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -71,5 +71,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:742
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:741
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
@@ -239,5 +239,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:880
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -254,5 +254,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:600
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -263,6 +263,10 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NPMCredentialsManager.java:104
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
@@ -394,4 +398,6 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NativePasswordManagerPlugin.java:123
+#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NativePasswordManagerPlugin.java:161
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
@@ -439,8 +445,8 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43
-#: ../plugins/joscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:49
-#: ../plugins/josmscript/_darcs/pristine/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:49
-#: ../plugins/josmscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:51
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
@@ -688,7 +694,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:902
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:600
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:231
@@ -741,17 +747,14 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:36
-#, fuzzy
 msgid "Download object..."
-msgstr "Laster ned …"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:36
-#, fuzzy
 msgid "Download OSM object by ID."
-msgstr "Laster ned OSM-data …"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:37
-#, fuzzy
 msgid "Download Object..."
-msgstr "Laster ned …"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:42
@@ -766,7 +769,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:45
-#, fuzzy
 msgid "Download referrers"
-msgstr "Last ned medlemmer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:46
@@ -775,33 +777,27 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:54
-#, fuzzy
 msgid "Object type:"
-msgstr "Objekthistorie"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:61
-#, fuzzy
 msgid "Object ID:"
-msgstr "Objekt"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:63
-#, fuzzy
 msgid "Enter the ID of the object that should be downloaded"
-msgstr "Navn på objekt ved musepeker"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:74
-#, fuzzy
 msgid "Download Object"
-msgstr "Laster ned data"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:43
-#, fuzzy
 msgid "Download object"
-msgstr "Last ned sted"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:80
-#, fuzzy
 msgid "Start downloading"
-msgstr "Start nedlasting av data"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:81
@@ -1287,5 +1283,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-msgid "Move nodes so all angles are 90 or 270 degrees"
+msgid "Move nodes so all angles are 90 or 180 degrees"
 msgstr ""
 
@@ -1455,5 +1451,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:628
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:348
@@ -1477,4 +1473,11 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1351
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:153
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:156
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
@@ -1519,7 +1522,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:239
-#: ../plugins/joscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:144
-#: ../plugins/josmscript/_darcs/pristine/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:150
-#: ../plugins/josmscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:153
 msgid "Save"
 msgstr "Lagre"
@@ -1627,7 +1627,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:122
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:932
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885
 msgid "Close"
 msgstr "Lukk"
@@ -3488,19 +3491,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:364
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:365
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:421
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:422
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:423
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:424
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:634
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:635
 #, java-format
 msgid ""
@@ -3509,5 +3512,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1006
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1007
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3515,5 +3518,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1008
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1009
 #, java-format
 msgid ""
@@ -3625,33 +3628,33 @@
 msgstr "Linje med \"to\" har ikke start eller slutt i \"via\"-node."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:358
 msgid "The \"from\" way does not start or end at the \"via\" way."
 msgstr "Linje med «from» har ikke start eller slutt i en «via»-linje."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:359
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:362
 msgid "The \"to\" way does not start or end at the \"via\" way."
 msgstr "linje med «to» har ikke start eller slutt i en «via»-linje."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:453
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:456
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Fant ikke stil for restriksjon {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:525
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:528
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Stil for indre linje «{0}» er samme som multipolygon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:553
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:556
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Stil for ytre linje «{0}» passer ikke."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:751
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:754
 #, java-format
 msgid "Error: {0}"
 msgstr "Feil: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:751
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:754
 #, java-format
 msgid "Warning: {0}"
@@ -4032,4 +4035,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
+#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NPMCredentialsManager.java:87
 msgid "Username"
 msgstr "Brukernavn"
@@ -4037,4 +4041,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
+#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NPMCredentialsManager.java:90
 msgid "Password"
 msgstr "Passord"
@@ -4165,5 +4170,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:947
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:936
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4362,5 +4367,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/properties/PropertiesDialog.java:491
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4413,4 +4418,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:494
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
 msgid "Tags"
@@ -4505,7 +4511,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:334
-#, fuzzy, java-format
+#, java-format
 msgid "{0} more..."
-msgstr "{0}, …"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:336
@@ -4636,7 +4642,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:643
-#, fuzzy
 msgid "Use all mine elements"
-msgstr "Enkelte element"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:669
@@ -4836,7 +4841,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340
-#, fuzzy
 msgid "Referenced by:"
-msgstr "Veinummer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:376
@@ -4986,6 +4990,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/properties/PropertiesDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:451
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112
@@ -4999,6 +5003,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/properties/PropertiesDialog.java:238
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:227
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:451
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5356,10 +5360,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:50
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:447
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5382,7 +5386,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "Conflicts: {0} unresolved"
-msgstr "Konflikter: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327
@@ -5449,5 +5453,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:935
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:924
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:195
@@ -5462,7 +5466,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../plugins/joscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:144
-#: ../plugins/josmscript/_darcs/pristine/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:150
-#: ../plugins/josmscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:153
 msgid "Add filter."
 msgstr ""
@@ -5504,20 +5505,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:68
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 msgid "History"
 msgstr "Historikk"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:68
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
 msgid "Display the history of all selected items."
 msgstr "Vis historikk på alle valgte objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:265
 msgid "Object with history"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:282
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:140
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:512
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:100
@@ -5525,13 +5526,13 @@
 msgstr "Last inn på nytt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:283
 msgid "Reload all currently selected objects and refresh the list."
 msgstr "Les inn og oppfrisk liste over alle valgte objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:312
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:322
 msgid "Show"
 msgstr "Vis"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:323
 msgid "Display the history of the selected objects."
 msgstr ""
@@ -5675,14 +5676,14 @@
 msgstr "Utvalg: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:360
 msgid "Undock the panel"
 msgstr "Frigjør panelet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:371
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:374
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr "Lukk panelet. Du kan åpne det med knappene i venstre verktøygruppe."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:385
 msgid "Click to minimize/maximize the panel content"
 msgstr "Klikk for at minimere/maksimere panelet"
@@ -5759,5 +5760,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
 msgid "Close the dialog"
 msgstr "Lukk vinduet"
@@ -7197,5 +7198,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:181
 #, java-format
 msgid "This will change {0} object."
@@ -7204,23 +7205,23 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:185
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:183
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:235
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:280
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:288
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:476
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:533
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:224
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:269
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:277
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:465
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:114
 msgid "<different>"
 msgstr "<different>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:249
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:366
 msgid "Change values?"
 msgstr "Endre verdier?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:299
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7229,5 +7230,5 @@
 msgstr[1] "Endre egenskap på inntil {0} objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:350
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:339
 #, java-format
 msgid "This will change up to {0} object."
@@ -7236,85 +7237,85 @@
 msgstr[1] "Dette vil endre opptil {0} objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:352
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:341
 msgid "Please select a key"
 msgstr "Velg en nøkkel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354
 msgid "Please select a value"
 msgstr "Velg en verdi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:451
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:440
 msgid "Please select the objects you want to change properties for."
 msgstr "Velg de objekter, du vil rette egenskaper for."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:457
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:447
 msgid "Properties/Memberships"
 msgstr "Egenskaper/medlemsskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:457
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
 msgid "Properties for selected objects."
 msgstr "Egenskaper for valgte objekt."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:491
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
 msgid "Member Of"
 msgstr "Medlem av"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:580
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:569
 msgid "Add Properties"
 msgstr "Tilføy egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:823
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Egenskaper: {0} / Medlemskap: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:826
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:815
 msgid "Properties / Memberships"
 msgstr "Egenskaper / Medlemskap"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:879
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
 msgid "Change relation"
 msgstr "Skift relasjon"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:880
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869
 msgid "Delete from relation"
 msgstr "Slett fra relasjon"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:882
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:871
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Vil du slette utvalget fra relasjon {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:903
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:892
 msgid "Delete the selected key in all objects"
 msgstr "Fjern den valgte nøkkel i alle objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:905
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:894
 msgid "Delete Properties"
 msgstr "DSlett egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:936
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:925
 msgid "Add a new key/value pair to all objects"
 msgstr "Tilføy et nytt nøkkel/verdi-sett til alle objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:948
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:937
 msgid "Edit the value of the selected key for all objects"
 msgstr "Rett verdien for den valgte nøkkel for alle objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:984
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:985
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation in main selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 msgid "Select relation in relation list."
 msgstr ""
@@ -8008,7 +8009,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:56
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:58
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesPanel.java:45
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesPanel.java:56
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesPanel.java:58
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:139
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:237
@@ -8180,5 +8178,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:141
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:149
 msgid "Reload the history from the server"
 msgstr ""
@@ -8548,4 +8546,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:145
+#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NPMCredentialsManager.java:97
 msgid "Save user and password (unencrypted)"
 msgstr "Lagre bruker og passord (ukryptert)"
@@ -8567,4 +8566,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242
+#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NPMCredentialsManager.java:93
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Advarsel: Passordet overføres ukryptert."
@@ -9437,5 +9437,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
@@ -9573,18 +9573,18 @@
 msgstr "API versjon: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:633
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Konvertér til GPX-lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:727
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:726
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:733
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:732
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:736
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:735
 msgid "Following problems found:"
 msgstr ""
@@ -9635,8 +9635,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:131
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:130
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "GPX Filer (*.gpx *.gpx.gz)"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:151
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
@@ -9644,4 +9650,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:175
 #, java-format
 msgid "Error while parsing {0}"
@@ -9649,4 +9658,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
 #, java-format
 msgid "Could not read \"{0}\""
@@ -9654,4 +9666,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:224
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:223
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9663,12 +9678,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:241
 msgid "Photo time (from exif):"
 msgstr "Tidspunkt for foto (fra EXIF):"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:256
 msgid "Gps time (read from the above photo): "
 msgstr "Gps tidspunkt (lest i bildet ovenfor): "
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:268
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/yyyy hh:mm:ss]"
@@ -9680,4 +9704,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:340
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:376
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:339
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:375
 msgid "No date"
 msgstr "Ingen dato"
@@ -9688,8 +9717,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:389
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "Synkroniser tiden fra et bilde på GPS-mottakeren"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:403
 msgid ""
 "Error while parsing the date.\n"
@@ -9700,16 +9735,28 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:405
 msgid "Invalid date"
 msgstr "Ugyldig dato"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:448
 msgid "<No GPX track loaded yet>"
 msgstr "<Ingen GPX-spor er lastet inn>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:455
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:454
 msgid "GPX track: "
 msgstr "GPX-spor: "
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:459
 msgid "Open another GPX trace"
 msgstr "Åpne flere GPX-spor"
@@ -9721,4 +9768,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:512
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
 msgid "Auto-Guess"
 msgstr "Automatisk forslag"
@@ -9747,8 +9797,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:558
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:475
 msgid "Timezone: "
 msgstr "Tidssone: "
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:569
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:497
 msgid "Offset:"
 msgstr "Forskyvning:"
@@ -9768,16 +9824,28 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:575
 msgid "Correlate images with GPX track"
 msgstr "Jevnfør bilder med GPX spor"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
 msgid "Correlate"
 msgstr "Jevnfør"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:700
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:602
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601
 msgid "Invalid timezone"
 msgstr "Ugyldig tidssone"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:708
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:615
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614
 msgid "Invalid offset"
 msgstr "Ugyldig forskyvning"
@@ -9792,4 +9860,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:774
 #, java-format
 msgid "Timezone: {0}"
@@ -9797,4 +9868,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:775
 #, java-format
 msgid "Minutes: {0}"
@@ -9802,4 +9876,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:868
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776
 #, java-format
 msgid "Seconds: {0}"
@@ -9814,4 +9891,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:913
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:865
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9822,8 +9902,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:915
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867
 msgid "Matching photos to track failed"
 msgstr "Klarte ikke å koble foto til sporet"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:883
 msgid "Adjust timezone and offset"
 msgstr "Juster tidssone og forskyvning"
@@ -9844,16 +9930,28 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:981
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:729
 msgid "GPX Track has no time information"
 msgstr "GPX sporet har ikke tidskoder"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:587
 msgid "You should select a GPX track"
 msgstr "Du bør velge et GPX-spor"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1077
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588
 msgid "No selected GPX track"
 msgstr "Intgen GPX-spor er valgt"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1265
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:600
 #, java-format
 msgid ""
@@ -9865,4 +9963,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1335
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:613
 #, java-format
 msgid ""
@@ -9874,8 +9975,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
 msgid "Extracting GPS locations from EXIF"
 msgstr "Leser GPS posisjoner fra EXIF"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Starting directory scan"
 msgstr "Starter scanning av mapper"
@@ -9887,8 +9994,16 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127
 msgid "Read photos..."
 msgstr "Les bilder"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
 #, java-format
 msgid "Reading {0}..."
@@ -9896,4 +10011,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
@@ -9901,4 +10019,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193
 #, java-format
 msgid "Scanning directory {0}"
@@ -9906,4 +10027,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198
 #, java-format
 msgid "Found null file in directory {0}\n"
@@ -9911,18 +10035,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Feil ved lesing av fil i mappa {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:282
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:274
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:63
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
 msgid "Geotagged Images"
 msgstr "Geotaggede bilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:306
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:298
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
 msgid "Correlate to GPX"
 msgstr "Juster til GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:326
 #, java-format
 msgid "{0} image loaded."
@@ -9931,5 +10064,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:335
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:327
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -9938,10 +10071,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:599
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:105
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:610
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:602
 #, java-format
 msgid ""
@@ -9950,13 +10083,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:627
 msgid "Image file could not be deleted."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:436
 msgid "No image"
 msgstr "Ingen bilder"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:451
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:488
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:446
 #, java-format
 msgid "Loading {0}"
@@ -9965,4 +10102,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:453
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:480
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:490
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:518
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:448
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:475
 #, java-format
 msgid "Error on file {0}"
@@ -9974,4 +10116,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:83
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:70
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:70
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106
 msgid "Previous"
@@ -9991,4 +10136,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:94
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:78
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:78
 msgid "Remove photo from layer"
 msgstr "Fjern foto fra lag"
@@ -9999,4 +10147,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:116
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:86
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:86
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
 msgid "Next"
@@ -10008,8 +10159,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:127
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:94
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:94
 msgid "Center view"
 msgstr "Midtstill kartbilde"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:130
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:102
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:102
 msgid "Zoom best fit and 1:1"
 msgstr "Zoom beste utsnitt 1:1"
@@ -10020,4 +10177,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:243
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:166
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:166
 #, java-format
 msgid ""
@@ -10029,4 +10189,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:246
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:169
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:169
 #, java-format
 msgid ""
@@ -10038,4 +10201,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/JpegFileFilter.java:31
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "JPEG-bilder (*.jpg)"
@@ -10953,5 +11119,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:150
 msgid "Draw a circle form HDOP value."
 msgstr ""
@@ -11053,5 +11219,5 @@
 #. only interesting directions
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:226
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Bare relevante retningsvisere (f.eks. ved enveiskjøring)"
@@ -11059,5 +11225,5 @@
 #. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
 msgid "Only on the head of a way."
 msgstr "Bare ved enden af linjen."
@@ -11083,9 +11249,9 @@
 msgstr "Glatting på kartgrafikk (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:82
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
 msgid "Draw lines between raw GPS points"
 msgstr "Tegn linjer mellom GPS-punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11095,9 +11261,9 @@
 "linjer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:107
 msgid "Maximum length for local files (meters)"
 msgstr "Max lengde for lokale filer (meter)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11106,10 +11272,10 @@
 "alle linjer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid "Maximum length (meters)"
 msgstr "Maksimal lengde (meter)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -11117,10 +11283,10 @@
 "Tvunget tegning av linjer dersom importerte data er uten linje informasjon."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:130
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Tegn retningspiler på linjer mellom GPS-punkt."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -11128,5 +11294,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11134,13 +11300,13 @@
 msgstr "Tegn ikke piler uten at det er minst denne avstand fra forrige punkt."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
 msgid "Minimum distance (pixels)"
 msgstr "Minste avstand (pixels)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:155
 msgid "Draw larger dots for the GPS points."
 msgstr "Tegn større prikker for GPS-punkter."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11150,58 +11316,59 @@
 "for Lag."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
 msgid "Colors points and track segments by velocity."
 msgstr "Punkt og track linjer får farge etter hastighet."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:184
+#, fuzzy
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
-"capture device needs to logs that information."
+"capture device needs to log that information."
 msgstr ""
 "Punkt og track linjer får farge etter dilution of position (HDOP). Dersom "
 "GPS kan logge dette."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Tillater å justere fargen etter forskjellig gjennomsnitt hastighet."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:194
 msgid "Track and Point Coloring"
 msgstr "Farge på punkt og track linjer"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
 msgid "GPS Points"
 msgstr "GPS-punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:221
 msgid "Draw direction hints for way segments."
 msgstr "Tegn retningspiler på linjestykker."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:237
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Tegn nummer for linjesegmenter i hver linje."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:242
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Bruk udjevning på kartvisningen for et mere glatt utseende."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:248
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Tegn omrisset av data hentet fra tjeneren."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "Tegn virtuelle noder i utvalget for lettere å endre linjer."
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "Draw the inactive data layers in a different color."
 msgstr "Tegn inaktive datalag i en annen farge."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
 msgid "OSM Data"
 msgstr "OSM-data"
@@ -11274,5 +11441,6 @@
 #, java-format
 msgid "The following plugin has been downloaded <strong>successfully</strong>:"
-msgid_plural "The following {0} plugins have been downloaded successfully:"
+msgid_plural ""
+"The following {0} plugins have been downloaded <strong>successfully</strong>:"
 msgstr[0] ""
 msgstr[1] ""
@@ -11367,6 +11535,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
-msgid ""
-"<p>Please note that shortcuts keys are assigned to the actions when JOSM is "
+#, fuzzy
+msgid ""
+"<p>Please note that shortcut keys are assigned to the actions when JOSM is "
 "started. So you need to <b>restart</b> JOSM to see your changes.</p>"
 msgstr ""
@@ -11375,8 +11544,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:167
+#, fuzzy
 msgid ""
 "<p>Furthermore, the shortcuts are activated when the actions are assigned to "
 "a menu entry of button for the first time. So some of your changes may "
-"become active even without restart --- but also without collistion handling. "
+"become active even without restart --- but also without collision handling. "
 "This is another reason to <b>restart</b> JOSM after making any changes here."
 "</p>"
@@ -11393,5 +11563,5 @@
 "keys that exist on your keyboard. Please use only those values that "
 "correspond to a real key on your keyboard. So if your keyboard has no "
-"''Copy'' key (PC keyboard do not have them, Sun keyboards do), the do not "
+"''Copy'' key (PC keyboard do not have them, Sun keyboards do), then do not "
 "use it. Also there will be ''keys'' listed that correspond to a shortcut on "
 "your keyboard (e.g. '':''/Colon). Please also do not use them, use the base "
@@ -11411,8 +11581,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:179
+#, fuzzy
 msgid ""
 "<p>The last page lists the modifier keys JOSM will automatically assign to "
 "shortcuts. For every of the four kinds of shortcuts there are three "
-"alternatives. JOSM will try those alternative in the listed order when "
+"alternatives. JOSM will try those alternatives in the listed order when "
 "managing a conflict. If all alternatives would result in shortcuts that are "
 "already taken, it will assign a random shortcut instead.</p>"
@@ -11739,10 +11910,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:65
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesPanel.java:65
 msgid "Plugin bundled with JOSM"
 msgstr "Programtillegg inkludert i JOSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:84
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesPanel.java:84
 msgid ""
 "Please click on <strong>Download list</strong> to download and display a "
@@ -11751,5 +11920,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:112
-#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesPanel.java:112
 #, java-format
 msgid "{0}: Version {1} (local: {2})"
@@ -11768,7 +11936,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:80
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:123
-#, fuzzy
 msgid "Never update"
-msgstr "Reverser Rute"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:84
@@ -12318,12 +12485,12 @@
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:62
-#, java-format
-msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
+#, fuzzy, java-format
+msgid "<html>Could not read file ''{0}''.<br>Error is:<br>{1}</html>"
 msgstr "<html>Kunne ikke lese fil ''{0}''.<br> Feilen er: <br>{1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:76
-#, java-format
-msgid "<html>Could not read files.<br> Error is: <br>{0}</html>"
-msgstr ""
+#, fuzzy, java-format
+msgid "<html>Could not read files.<br>Error is:<br>{0}</html>"
+msgstr "<html>Kunne ikke lese fil ''{0}''.<br> Feilen er: <br>{1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:41
@@ -12794,7 +12961,8 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:82
-#, java-format
-msgid "Illegal nummeric value for attribute ''{0}''. Got ''{1}''."
-msgstr ""
+#, fuzzy, java-format
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgstr ""
+"ugyldig verdi for obligatorisk attributt «{0}» av type «long» – leste «{1}»"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:116
@@ -12897,7 +13065,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
-#, fuzzy, java-format
+#, java-format
 msgid "Deleted way {0} contains nodes"
-msgstr "Valgt linje inneholder ikke valgt node."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:220
@@ -12931,7 +13099,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250
-#, fuzzy, java-format
+#, java-format
 msgid "Deleted relation {0} contains members"
-msgstr "Last ned medlemer av relasjon"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
@@ -12975,6 +13143,6 @@
 
 #. for a new primitive we just log a warning
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:382
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:373
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:383
 #, java-format
 msgid ""
@@ -12984,21 +13152,21 @@
 
 #. for an existing primitive this is a problem
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:376
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:386
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:387
 #, java-format
 msgid "Illegal value for attribute ''changeset''. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:395
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:396
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:400
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:401
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:421
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:422
 #, java-format
 msgid ""
@@ -13006,10 +13174,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:433
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:434
+#, java-format
 msgid "Deleted node {0} is part of way {1}"
-msgstr "Slett noder eller linjer."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:441
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:442
 #, java-format
 msgid ""
@@ -13018,5 +13186,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:489
 #, java-format
 msgid ""
@@ -13025,18 +13193,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:512
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:513
+#, java-format
 msgid "Deleted member {0} is used by relation {1}"
-msgstr "Slettet medlem «{0}» i relasjon."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:539
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:540
 msgid "Prepare OSM data..."
 msgstr "Klargjør OSM-data …"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:540
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:541
 msgid "Parsing OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:545
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:546
 msgid "Preparing data set..."
 msgstr ""
@@ -13355,6 +13523,7 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:556
-msgid "Removing umaintained plugins..."
-msgstr ""
+#, fuzzy
+msgid "Removing unmaintained plugins..."
+msgstr "Fjerner doble noder …"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:580
@@ -13410,5 +13579,5 @@
 msgid ""
 "Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM still going to load the old plugin version."
+"installation. JOSM is still going to load the old plugin version."
 msgstr ""
 
@@ -13579,11 +13748,11 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:117
 msgid ""
-"You have encountered an error in JOSM. Before you file a bug reportmake sure "
-"you have updated to the latest version of JOSM here:"
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:121
 msgid ""
-"You should also update your plugins. If neither of those help pleasefile a "
+"You should also update your plugins. If neither of those help please file a "
 "bug report in our bugtracker using this link:"
 msgstr ""
@@ -13591,6 +13760,6 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:125
 msgid ""
-"There the error information provided below should already befilled in for "
-"you. Please include information on how to reproducethe error and try to "
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
 "supply as much detail as possible."
 msgstr ""
@@ -13599,5 +13768,5 @@
 msgid ""
 "Alternatively, if that does not work you can manually fill in the "
-"informationbelow at this URL:"
+"information below at this URL:"
 msgstr ""
 
@@ -14178,4 +14347,165 @@
 msgid "Starting address number must be less than ending address number"
 msgstr ""
+
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
+msgid "AgPifoJ - Geotagged pictures"
+msgstr "AgPifoJ – Geotaggede  bilder"
+
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
+#, fuzzy
+msgid "Display geotagged photos"
+msgstr "Vis foto uten geotag posisjon"
+
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
+msgid "One of the selected files was null !!!"
+msgstr ""
+
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+msgid "image"
+msgid_plural "images"
+msgstr[0] "bilde"
+msgstr[1] "bilder"
+
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#, java-format
+msgid "{0} were found to be gps tagged."
+msgstr ""
+
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46
+msgid "Open images with AgPifoJ..."
+msgstr "Åpne bilder med AgPifoJ …"
+
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47
+msgid "Load set of images as a new layer."
+msgstr "Last inn bildesett som et nyt lag."
+
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:276
+#, fuzzy
+msgid "I'm in the timezone of: "
+msgstr "Jeg er i tidssonen: "
+
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:348
+#, fuzzy
+msgid "Open an other photo"
+msgstr "Åpne et annet foto"
+
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:510
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:509
+msgid "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
+msgstr ""
+"<html>Jeg kan fotogragere min GPS mottaker.<br>Kan det være til hjelp?</html>"
+
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:526
+#, fuzzy
+msgid "Update position for: "
+msgstr "Oppdatere utvalg"
+
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:535
+msgid "All images"
+msgstr "Alle bilder"
+
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:545
+msgid "Images with no exif position"
+msgstr "Bilder uden EXIF-posisjon"
+
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:555
+msgid "Not yet tagged images"
+msgstr "Bilder uten egenskaper"
+
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:657
+#, java-format
+msgid "Found {0} matches of {1} in GPX track {2}"
+msgstr "Fant {0} treff av {1} i GPX spor {2}"
+
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658
+msgid "GPX Track loaded"
+msgstr "GPX-spor er lagt inn"
+
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:693
+#, fuzzy
+msgid "The selected photos don't contain time information."
+msgstr "Valgte foto har ikke tidskode."
+
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694
+#, fuzzy
+msgid "Photos don't contain time information"
+msgstr "Foto har ikke tidskode."
+
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:730
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:728
+#, fuzzy
+msgid ""
+"The selected GPX track doesn't contain timestamps. Please select another one."
+msgstr "Valgte GPX spor mangler tidskode. Velg et annet spor."
+
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:793
+#, fuzzy, java-format
+msgid "Matched {0} of {1} photos to GPX track."
+msgstr "Klarte ikke å koble foto til sporet"
+
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:796
+#, fuzzy, java-format
+msgid "(Time difference of {0} days)"
+msgstr "tidssone-forskjell: "
+
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:803
+#, java-format
+msgid "Offset between track and photos: {0}m {1}s"
+msgstr "Forskyvning mellom spor og foto: {0}m {1}s"
+
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885
+msgid "Default Values"
+msgstr "Standardverdier"
+
+#: ../plugins/agpifoj
+#: fst/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:478
+#, fuzzy
+msgid "No image -dsffs"
+msgstr "Ingen bilder"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:104
@@ -14312,23 +14642,23 @@
 msgstr "Vis grenser for nedlatede data."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:187
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:40
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:204
 msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:56
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:58
 msgid ""
 "Automaticly select first WMS layer when grabing if multiple layers exist."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:61
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63
 msgid "Enable automatic caching."
 msgstr "Aktiviser automatisk mellomlager."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:64
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:66
 msgid "Max. cache size (in MB)"
 msgstr "Max. lager størrelse (i MB)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
 msgid ""
 "A special handler of the French cadastre wms at www.cadastre.gouv."
@@ -14345,9 +14675,9 @@
 "<BR>før du laster inn data med dette programtillegget."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81
 msgid "French cadastre WMS"
 msgstr "Fransk cadastre WMS"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
@@ -14355,10 +14685,10 @@
 "html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:84
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:86
 msgid "Source"
 msgstr "Kilde"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:90
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:218
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:235
 msgid ""
 "Replace the original white background by the backgound color defined in JOSM "
@@ -14367,5 +14697,5 @@
 "Bytt ut original hvit bacgrunn med fargen angitt i innstillingene for JOSM."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:97
 msgid ""
 "Invert the original black and white colors (and all intermediate greys). "
@@ -14375,49 +14705,67 @@
 "tekst på mørk bakgrunn."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107
 msgid "Allows multiple layers stacking"
 msgstr "Tillat stabling av flere lag"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:112
 msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr "Sett transperens på WMS lag. Høyre: opak, venstre: transparent."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:123
 msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr "Trekk et rektangel rundt data lastet ned fra WMS-tjener."
 
+#. option to select image zooming interpolation method
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127
+#, fuzzy
+msgid "Image zoom interpolation:"
+msgstr "Interpolasjon"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129
+msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:130
+msgid "Bilinear (fast)"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:131
+msgid "Bicubic (slow)"
+msgstr ""
+
 #. the vectorized images multiplier
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:128
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145
 msgid "Vector images grab multiplier:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:160
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:164
 msgid "Grab smaller images (higher quality but use more memory)"
 msgstr "Hent mindre bilder (høyere kvalitet men minnekrevende)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:168
 msgid "Fixed size square (default is 100m)"
 msgstr "Fast kvadrat størrelse (standard er 100m)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:171
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188
 msgid "Fixed size (from 25 to 1000 meters)"
 msgstr "Fast størrelse (fra 25 til 1000 meter)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:180
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197
 msgid "Raster images grab multiplier:"
 msgstr ""
 
 #. the crosspiece display
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:190
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:207
 msgid "Display crosspieces:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:224
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241
 msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 "De eldste filene blir automatisk slettet når denne størrelsen overskrides"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:230
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:247
 msgid ""
 "Automatically selects the first WMS layer if multiple layers exist when "
@@ -14689,5 +15037,5 @@
 "Velg ett og prøv på nytt"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:87
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:88
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:75
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:187
@@ -14695,28 +15043,28 @@
 msgstr "Blankt lag"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:214
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:215
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "WMS lag ({0}), {1} kartutsnitt er lastet"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:217
 msgid "Is not vectorized."
 msgstr "Er ikke vektorisert"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:217
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:218
 #, java-format
 msgid "Raster size: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:219
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:220
 msgid "Is vectorized."
 msgstr "Er vektorisert"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:220
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:221
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "Kommune avgrensing: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:425
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:436
 #, java-format
 msgid ""
@@ -14727,9 +15075,9 @@
 "Create a new one."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:426
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:437
 msgid "Cache Format Error"
 msgstr "Feil i mellomlager format"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:448
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:459
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
@@ -14737,5 +15085,5 @@
 "Lambert-sone {0} i hurtiglager ikke kompatibel med gjeldende Lambert-sone {1}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:450
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:461
 msgid "Cache Lambert Zone Error"
 msgstr "Feil Lambert sone på mellomlager"
@@ -15091,38 +15439,4 @@
 msgid "Open images with ImageWayPoint"
 msgstr "Åpne bilder med ImageWayPoint"
-
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47
-msgid "Load set of images as a new layer."
-msgstr "Last inn bildesett som et nyt lag."
-
-#: ../plugins/joscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:49
-#: ../plugins/josmscript/_darcs/pristine/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:49
-#: ../plugins/josmscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:51
-msgid "Josminator - Just do it!"
-msgstr ""
-
-#: ../plugins/joscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:49
-#: ../plugins/josmscript/_darcs/pristine/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:49
-#: ../plugins/josmscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:51
-msgid "Do some stuff"
-msgstr ""
-
-#: ../plugins/joscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:49
-#: ../plugins/josmscript/_darcs/pristine/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:49
-#: ../plugins/josmscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:51
-msgid "Dsdfasdfsdfotos"
-msgstr ""
-
-#: ../plugins/joscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:121
-#: ../plugins/josmscript/_darcs/pristine/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:127
-#: ../plugins/josmscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:129
-msgid "Exec"
-msgstr ""
-
-#: ../plugins/joscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:121
-#: ../plugins/josmscript/_darcs/pristine/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:127
-#: ../plugins/josmscript/src/org/openstreetmap/josm/plugins/josmscript/JosmScriptDialog.java:129
-msgid "Execute Script"
-msgstr ""
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69
@@ -15621,4 +15935,107 @@
 msgstr ""
 
+#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NPMCredentialsManager.java:37
+#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NPMCredentialsManager.java:55
+msgid "Native Password Manager Plugin: "
+msgstr ""
+
+#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NPMCredentialsManager.java:37
+#, java-format
+msgid "lookup {0} ("
+msgstr ""
+
+#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NPMCredentialsManager.java:55
+#, fuzzy, java-format
+msgid "store {0} ("
+msgstr "Fransk Cadastre: {0}"
+
+#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NPMCredentialsManager.java:85
+msgid "Incorrect password or username."
+msgstr "Feil passord eller brukernavn."
+
+#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NPMCredentialsManager.java:103
+msgid "Enter Password"
+msgstr "Skriv inn passord"
+
+#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NPMCredentialsManager.java:104
+msgid "Login"
+msgstr "Logg inn"
+
+#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NPMCredentialsManager.java:161
+#, fuzzy
+msgid "show"
+msgstr "Vis"
+
+#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NPMCredentialsManager.java:175
+msgid "Login name (e-mail) to the OSM account."
+msgstr "E-postadresse for OSM-kontoen"
+
+#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NPMCredentialsManager.java:176
+msgid ""
+"Login password to the OSM account. Leave blank to not store any password."
+msgstr ""
+"Innloggings passord til OSM kontoen. La feltet være tomt for ikke å lagre "
+"noen passord."
+
+#. Main.pref.get("osm-server.url", "http://api.openstreetmap.org/api"));
+#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NPMCredentialsManager.java:219
+msgid "The base URL for the OSM server (REST API)"
+msgstr "URL-adressen for OSM-tjeneren (REST API)"
+
+#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NPMCredentialsManager.java:220
+msgid "Base Server URL"
+msgstr ""
+
+#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NPMCredentialsManager.java:227
+msgid "OSM username (e-mail)"
+msgstr "OSM-brukernavn (e-post)"
+
+#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NPMCredentialsManager.java:229
+#, fuzzy
+msgid "OSM password"
+msgstr "Passord hos OSM."
+
+#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NPMCredentialsManager.java:335
+#, fuzzy
+msgid ""
+"<html>WARNING: The password is stored in plain text in the preferences file."
+"<br>The password is transferred in plain text to the server, encoded in the "
+"URL.<br><b>Do not use a valuable Password.</b></html>"
+msgstr ""
+"<html>ADVARSEL: Passordet er lagret i vanlig tekst (IKKE KRYPTERT) i "
+"konfigurasjons filen.<br>Passordet er overført i vanlig tekst til serveren, "
+"satt inn i web adressen.<br><b>Ikke bruk et viktig passord da andre kan lese "
+"det.</b></html>"
+
+#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NativePasswordManagerPlugin.java:107
+msgid ""
+"<html>No native password managers could be found.<br>Make sure you have one "
+"of the following applications<br>installed and running:"
+"<ul><li>gnomekeyring<li>KWallet 3<li>KWallet 4</ul>Your password is still "
+"saved to a plain text file!"
+msgstr ""
+
+#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NativePasswordManagerPlugin.java:114
+#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NativePasswordManagerPlugin.java:122
+msgid "Native password manager plugin"
+msgstr ""
+
+#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NativePasswordManagerPlugin.java:123
+#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NativePasswordManagerPlugin.java:161
+#, fuzzy
+msgid "don't change my settings"
+msgstr "Ingen åpne endringsset"
+
+#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NativePasswordManagerPlugin.java:125
+#, java-format
+msgid ""
+"{0} was detected.\n"
+"Do you like to have your password saved by this password manager?"
+msgstr ""
+
+#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NativePasswordManagerPlugin.java:143
+msgid "More than one native password manager has been detected. Please choose:"
+msgstr ""
+
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:46
 msgid "OpenLayers"
@@ -15832,7 +16249,6 @@
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:79
-#, fuzzy
 msgid "settings"
-msgstr "streng"
+msgstr ""
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:82
@@ -15841,7 +16257,6 @@
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
-#, fuzzy
 msgid "change file modification time:"
-msgstr "Bytt område"
+msgstr ""
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
@@ -15863,12 +16278,10 @@
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:171
-#, fuzzy
 msgid "Could not read mtime."
-msgstr "Klarte ikke lese «{0}»"
+msgstr ""
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:184
-#, fuzzy
 msgid "Could not write mtime."
-msgstr "Kunne ikke hente bilde"
+msgstr ""
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:224
@@ -15918,4 +16331,38 @@
 msgstr ""
 
+#. item "Bicycle/Rental" text "Name"
+#: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
+#: build/trans_presets.java:1417
+msgid "Public Transport"
+msgstr "Offentlig transport"
+
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:479
+msgid "Route patterns ..."
+msgstr ""
+
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:480
+msgid "Edit Route patterns for public transport"
+msgstr ""
+
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:492
+#, fuzzy
+msgid "Overview"
+msgstr "Skriv over"
+
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:496
+#, fuzzy
+msgid "Itinerary"
+msgstr "kommunevei"
+
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:498
+#, fuzzy
+msgid "Stops"
+msgstr "Full stopp"
+
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:500
+#, fuzzy
+msgid "Meta"
+msgstr "Bilutleie"
+
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
 msgid "load data from API"
@@ -15974,20 +16421,20 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:233
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:246
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:235
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:248
 msgid "Do you want to allow this?"
 msgstr "Vil du tillate dette?"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:234
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:247
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:236
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:249
 msgid "Confirm Remote Control action"
 msgstr "Bekreft Remote Control handlinger"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:232
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:234
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:244
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:246
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "Remote Control har bedt om data fra denne URL:"
@@ -16432,22 +16879,18 @@
 
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java:82
-#, fuzzy
 msgid "Merge objects nodes"
-msgstr "Samle {0} noder"
+msgstr ""
 
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
-#, fuzzy
 msgid "Tracer"
-msgstr "Terasse"
+msgstr ""
 
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
-#, fuzzy
 msgid "Tracer."
-msgstr "Terasse"
+msgstr ""
 
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:136
-#, fuzzy
 msgid "Tracer building"
-msgstr "Terasseinndeling av hus (og rekkehus)"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37
@@ -17108,13 +17551,5 @@
 msgstr "vannvei type {0}"
 
-#. color place
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- special display of unreviewed tiger data (USA) -->
-#. <rule>
-#. <condition k="tiger:reviewed" v="no"/>
-#. <linemod mode="under" width="10" colour="#808000"/>
+#. color tiger_data
 #. </rule>
 #.
@@ -17681,11 +18116,20 @@
 msgstr ""
 
+#. Plugin AgPifoJ
+#: build/trans_plugins.java:5 build/trans_plugins.java:7
+msgid ""
+"Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
+"import EXIF geotagged pictures."
+msgstr ""
+"Et annet geotag programtillegg for JOSM. Kobler bilder med GPS spor eller "
+"importerer bilder med koordinater i EXIF."
+
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:5
+#: build/trans_plugins.java:9
 msgid "A special handler for the French land registry WMS server."
 msgstr "En spesiell håntering for det franske landregisterets WMS tjener"
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:7
+#: build/trans_plugins.java:11
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -17701,10 +18145,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:9
+#: build/trans_plugins.java:13
 msgid "Create a grid of ways."
 msgstr "Lag et rutenett med linjer."
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:11
+#: build/trans_plugins.java:15
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -17712,10 +18156,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:13
+#: build/trans_plugins.java:17
 msgid "Allows to import various file formats into JOSM directly."
 msgstr "Lar deg importere forskjellige dataformater direkte i JOSM."
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:15
+#: build/trans_plugins.java:19
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -17726,10 +18170,10 @@
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:17
+#: build/trans_plugins.java:21
 msgid "Duplicate Ways with an offset"
 msgstr "Dupliser linjer med parallell avstand"
 
 #. Plugin editgpx
-#: build/trans_plugins.java:19
+#: build/trans_plugins.java:23
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -17739,20 +18183,20 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:21
+#: build/trans_plugins.java:25
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr "Last ned GPS punkt fra Globalsat dg100 data logger direkte til JOSM"
 
 #. Plugin graphview
-#: build/trans_plugins.java:23
+#: build/trans_plugins.java:27
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
 
 #. Plugin grid
-#: build/trans_plugins.java:25
+#: build/trans_plugins.java:29
 msgid "Provide a background layer that displays a map grid"
 msgstr "Bakgrunnslag som viser rutenettet i kartet"
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:27
+#: build/trans_plugins.java:31
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -17763,10 +18207,4 @@
 "opprettes når 'name', 'cmt' eller 'desc' egenskapen på et waypoint stemmer "
 "med filenavnet til et bilde."
-
-#. Plugin JOSM_Script
-#: build/trans_plugins.java:29 build/trans_plugins.java:31
-#, fuzzy
-msgid "nice Plugin"
-msgstr "Programtillegg"
 
 #. Plugin lakewalker
@@ -17806,6 +18244,15 @@
 msgstr ""
 
+#. Plugin native_password_manager
+#: build/trans_plugins.java:43
+msgid ""
+"(Linux only.) Let the native password management system store the osm login "
+"password and username rather than putting it unencrypted in a plain text "
+"file. Currently only Unix-like operating systems are supported. (Using gnome-"
+"keyring or KWallet.)"
+msgstr ""
+
 #. Plugin nearclick
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -17818,15 +18265,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid "Displays an OpenLayers background image"
 msgstr "Viser bakgrunnsbildet i et åpent lag"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importerer tema fra OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -17834,5 +18281,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -17840,5 +18287,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -17847,5 +18294,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -17856,15 +18303,21 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "JGoodies Plastic Look and Feel."
 
+#. Plugin public_transport
+#: build/trans_plugins.java:61
+msgid ""
+"This plugin simplifies the mapping and editing of public transport routes."
+msgstr ""
+
 #. Plugin remotecontrol
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:63
 msgid "Let other applications send commands to JOSM."
 msgstr "La andre program sende kommandoer til JOSM."
 
 #. Plugin routes
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:65
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -17875,10 +18328,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:67
 msgid "Provides routing capabilities."
 msgstr "Gir deg Ruteplanlegger på OSM data."
 
 #. Plugin slippymap
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:69
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -17889,15 +18342,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:71
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Legger inn markører eller Noder på gps posisjon."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:73
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Dialog for å redigere egenskaper i en tabell."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:75
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -17910,10 +18363,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:77
 msgid "Make terraced houses out of single blocks."
 msgstr "Lager rekkehus / terassehus fra en enkel husblokk."
 
 #. Plugin Tracer
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:79
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -17922,5 +18375,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:77
+#: build/trans_plugins.java:81
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -17931,5 +18384,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:83
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -17938,10 +18391,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:85
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Last enkelt ned data langs strekninger av sammenknyttede veier."
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:87
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21601,9 +22054,4 @@
 msgstr "Rediger sykkelutleie"
 
-#. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1417
-msgid "Public Transport"
-msgstr "Offentlig transport"
-
 #. group "Public Transport"
 #: build/trans_presets.java:1418
@@ -30045,4 +30493,17 @@
 msgstr "sted"
 
+#. color place
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- special display of unreviewed tiger data (USA) -->
+#. <rule>
+#. <condition k="tiger:reviewed" v="no"/>
+#: build/trans_style.java:4239
+#, fuzzy
+msgid "tiger_data"
+msgstr "tiger"
+
 #. color area
 #. <scale_min>1</scale_min>
@@ -30659,12 +31120,4 @@
 #~ msgstr "GPS-slutt: {0}"
 
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "bilde"
-#~ msgstr[1] "bilder"
-
-#~ msgid "timezone difference: "
-#~ msgstr "tidssone-forskjell: "
-
 #~ msgid "{0} within the track."
 #~ msgstr "{0} innenfor sporet."
@@ -30697,31 +31150,6 @@
 #~ msgstr "Innloggings navnet (e-postadresse) til OSM kontoen."
 
-#~ msgid ""
-#~ "Login password to the OSM account. Leave blank to not store any password."
-#~ msgstr ""
-#~ "Innloggings passord til OSM kontoen. La feltet være tomt for ikke å lagre "
-#~ "noen passord."
-
-#~ msgid ""
-#~ "<html>WARNING: The password is stored in plain text in the preferences "
-#~ "file.<br>The password is transfered in plain text to the server, encoded "
-#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
-#~ msgstr ""
-#~ "<html>ADVARSEL: Passordet er lagret i vanlig tekst (IKKE KRYPTERT) i "
-#~ "konfigurasjons filen.<br>Passordet er overført i vanlig tekst til "
-#~ "serveren, satt inn i web adressen.<br><b>Ikke bruk et viktig passord da "
-#~ "andre kan lese det.</b></html>"
-
-#~ msgid "Incorrect password or username."
-#~ msgstr "Feil passord eller brukernavn."
-
 #~ msgid "Unknown version"
 #~ msgstr "Ukjent versjon"
-
-#~ msgid "Enter Password"
-#~ msgstr "Skriv inn passord"
-
-#~ msgid "Login"
-#~ msgstr "Logg inn"
 
 #~ msgid "Delete and Download"
@@ -30863,25 +31291,4 @@
 #~ "openstreetmap.org"
 
-#~ msgid "Not yet tagged images"
-#~ msgstr "Bilder uten egenskaper"
-
-#~ msgid "Images with no exif position"
-#~ msgstr "Bilder uden EXIF-posisjon"
-
-#~ msgid "All images"
-#~ msgstr "Alle bilder"
-
-#~ msgid ""
-#~ "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
-#~ msgstr ""
-#~ "<html>Jeg kan fotogragere min GPS mottaker.<br>Kan det være til hjelp?</"
-#~ "html>"
-
-#~ msgid "GPX Track loaded"
-#~ msgstr "GPX-spor er lagt inn"
-
-#~ msgid "Found {0} matches of {1} in GPX track {2}"
-#~ msgstr "Fant {0} treff av {1} i GPX spor {2}"
-
 #~ msgid ""
 #~ "An error occured while trying to match the photos to the GPX track. You "
@@ -30891,7 +31298,4 @@
 #~ "kobling."
 
-#~ msgid "Offset between track and photos: {0}m {1}s"
-#~ msgstr "Forskyvning mellom spor og foto: {0}m {1}s"
-
 #~ msgid "Lambert Zone 3 cache file (.3)"
 #~ msgstr "Lambert Zone 3 cache file (.3)"
@@ -30899,7 +31303,4 @@
 #~ msgid "Lambert Zone 2 cache file (.2)"
 #~ msgstr "Lambert Zone 2 cache file (.2)"
-
-#~ msgid "Default Values"
-#~ msgstr "Standardverdier"
 
 #~ msgid "Lambert Zone 4 cache file (.4)"
@@ -31056,11 +31457,4 @@
 
 #~ msgid ""
-#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
-#~ "import EXIF geotagged pictures."
-#~ msgstr ""
-#~ "Et annet geotag programtillegg for JOSM. Kobler bilder med GPS spor eller "
-#~ "importerer bilder med koordinater i EXIF."
-
-#~ msgid ""
 #~ "The main feature of the plugin is the possibility to delete points of the "
 #~ "GPX track. This plugin can be used to prepare  tracks for uploading to "
@@ -31331,10 +31725,4 @@
 #~ msgstr "Fant ikke noe objekt med ID {0} og versjon {1} i dette datasettet"
 
-#~ msgid "Login name (e-mail) to the OSM account."
-#~ msgstr "E-postadresse for OSM-kontoen"
-
-#~ msgid "OSM username (e-mail)"
-#~ msgstr "OSM-brukernavn (e-post)"
-
 #~ msgid "Plugin {0} requires JOSM update to version {1}."
 #~ msgstr "Programtillegg {0} krever JOSM-oppdatering til versjon {1}."
@@ -31352,7 +31740,4 @@
 #~ msgstr "Laster opp …"
 
-#~ msgid "Open images with AgPifoJ..."
-#~ msgstr "Åpne bilder med AgPifoJ …"
-
 #~ msgid "Import TCX File..."
 #~ msgstr "Importer TCX-fil …"
@@ -31387,7 +31772,4 @@
 #~ msgid "Proxy server password"
 #~ msgstr "Passord for proxy-tjener"
-
-#~ msgid "The base URL for the OSM server (REST API)"
-#~ msgstr "URL-adressen for OSM-tjeneren (REST API)"
 
 #~ msgid "Downloaded plugin information from {0} site"
@@ -31494,7 +31876,4 @@
 #~ msgid "Use preset ''{0}''"
 #~ msgstr "Bruk objektmal «{0}»"
-
-#~ msgid "AgPifoJ - Geotagged pictures"
-#~ msgstr "AgPifoJ – Geotaggede  bilder"
 
 #~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
